diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-09-11 11:00:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-09-18 16:20:26 +0200 |
| commit | e701c67c30e65cc887b1ebdd6ef91010f0ca46fa (patch) | |
| tree | eb4410a9f1a325ebc5c2ea10a463e580b2644118 /drivers/nvmem | |
| parent | f7c04f16d76e795f52a8fdbf11d351346fe7032c (diff) | |
| download | linux-next-e701c67c30e65cc887b1ebdd6ef91010f0ca46fa.tar.gz | |
nvmem: remove unneeded IS_ENABLED(CONFIG_NVMEM) conditional
As you see in drivers/nvmem/Makefile, this C file is compiled only
when CONFIG_NVMEM is y or m.
So, IS_ENABLED(CONFIG_NVMEM) is always evaluated to 1 in this file.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nvmem')
| -rw-r--r-- | drivers/nvmem/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 730cc06656c8..0a3464f647a4 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -615,7 +615,7 @@ static struct nvmem_device *nvmem_find(const char *name) return to_nvmem_device(d); } -#if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF) +#if IS_ENABLED(CONFIG_OF) /** * of_nvmem_device_get() - Get nvmem device from a given id * @@ -753,7 +753,7 @@ static struct nvmem_cell *nvmem_cell_get_from_list(const char *cell_id) return cell; } -#if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF) +#if IS_ENABLED(CONFIG_OF) /** * of_nvmem_cell_get() - Get a nvmem cell from given device node and cell id * |