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

From	srinivas.kandagatla@linaro.org
Newsgroups	linux.kernel
Subject	[PATCH 4/4] nvmem: remove unneeded IS_ENABLED(CONFIG_NVMEM) conditional
Date	2017-09-11 11:10 +0200
Message-ID	<uosT8-Sm-13@gated-at.bofh.it> (permalink)
References	<uosT7-Sm-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 4/4] nvmem: remove unneeded IS_ENABLED(CONFIG_NVMEM) conditional srinivas.kandagatla@linaro.org - 2017-09-11 11:10 +0200
  Re: [PATCH 4/4] nvmem: remove unneeded IS_ENABLED(CONFIG_NVMEM)  conditional Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-09-18 16:10 +0200
    Re: [PATCH 4/4] nvmem: remove unneeded IS_ENABLED(CONFIG_NVMEM)  conditional Srinivas Kandagatla <srinivas.kandagatla@linaro.org> - 2017-09-18 17:10 +0200

csiph-web