[4/4] nvmem: remove unneeded IS_ENABLED(CONFIG_NVMEM) conditional

Message ID 20170911090014.16806-5-srinivas.kandagatla@linaro.org
State New
Headers show
Series
  • nvmem: set2 patches for v4.14
Related show

Commit Message

Srinivas Kandagatla Sept. 11, 2017, 9 a.m.
From: Masahiro Yamada <yamada.masahiro@socionext.com>


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>

---
 drivers/nvmem/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.9.3

Comments

Greg Kroah-Hartman Sept. 18, 2017, 2:09 p.m. | #1
On Mon, Sep 11, 2017 at 11:00:14AM +0200, srinivas.kandagatla@linaro.org wrote:
> From: Masahiro Yamada <yamada.masahiro@socionext.com>

> 

> 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>

> ---

>  drivers/nvmem/core.c | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)


Again, not a bugfix, should go into 4.15-rc1.
Srinivas Kandagatla Sept. 18, 2017, 3:02 p.m. | #2
On 18/09/17 15:09, Greg Kroah-Hartman wrote:
> On Mon, Sep 11, 2017 at 11:00:14AM +0200,srinivas.kandagatla@linaro.org  wrote:

>> From: Masahiro Yamada<yamada.masahiro@socionext.com>

>>

>> 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>

>> ---

>>   drivers/nvmem/core.c | 4 ++--

>>   1 file changed, 2 insertions(+), 2 deletions(-)

> Again, not a bugfix, should go into 4.15-rc1.

Okay, No Problem!

thanks,
srini

Patch

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index fdb8b7a..8649045 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
  *