linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/5] kconfig.h: use __is_defined() to check if MODULE is defined
@ 2016-06-14  5:58 Masahiro Yamada
  2016-06-14  5:58 ` [PATCH 2/5] export.h: use __is_defined() to check if __KSYM_* " Masahiro Yamada
                   ` (3 more replies)
  0 siblings, 4 replies; 11+ messages in thread
From: Masahiro Yamada @ 2016-06-14  5:58 UTC (permalink / raw)
  To: linux-kernel, Andrew Morton
  Cc: Rusty Russell, Michal Simek, Linus Torvalds, Arnd Bergmann,
	Michal Marek, Nicolas Pitre, Masahiro Yamada

The macro MODULE is not a config option, it is a per-file build
option.  So, config_enabled(MODULE) is not sensible.  (There is
another case in include/linux/export.h, where config_enabled() is
used against a non-config option.)

This commit renames some macros in include/linux/kconfig.h for the
use for non-config macros and replaces config_enabled(MODULE) with
__is_defined(MODULE).

I am keeping config_enabled() because it is still referenced from
some places, but I expect it would be deprecated in the future.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 include/linux/kconfig.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h
index b33c779..a94b5bf 100644
--- a/include/linux/kconfig.h
+++ b/include/linux/kconfig.h
@@ -17,10 +17,11 @@
  * the last step cherry picks the 2nd arg, we get a zero.
  */
 #define __ARG_PLACEHOLDER_1 0,
-#define config_enabled(cfg) _config_enabled(cfg)
-#define _config_enabled(value) __config_enabled(__ARG_PLACEHOLDER_##value)
-#define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0)
-#define ___config_enabled(__ignored, val, ...) val
+#define config_enabled(cfg)		___is_defined(cfg)
+#define __is_defined(x)			___is_defined(x)
+#define ___is_defined(val)		____is_defined(__ARG_PLACEHOLDER_##val)
+#define ____is_defined(arg1_or_junk)	__take_second_arg(arg1_or_junk 1, 0)
+#define __take_second_arg(__ignored, val, ...) val
 
 /*
  * IS_BUILTIN(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0
@@ -42,7 +43,7 @@
  * built-in code when CONFIG_FOO is set to 'm'.
  */
 #define IS_REACHABLE(option) (config_enabled(option) || \
-		 (config_enabled(option##_MODULE) && config_enabled(MODULE)))
+		 (config_enabled(option##_MODULE) && __is_defined(MODULE)))
 
 /*
  * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
-- 
1.9.1

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2016-06-23  8:08 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-14  5:58 [PATCH 1/5] kconfig.h: use __is_defined() to check if MODULE is defined Masahiro Yamada
2016-06-14  5:58 ` [PATCH 2/5] export.h: use __is_defined() to check if __KSYM_* " Masahiro Yamada
2016-06-14 17:10   ` Nicolas Pitre
2016-06-14  5:58 ` [PATCH 3/5] kconfig.h: use already defined macros for IS_REACHABLE() define Masahiro Yamada
2016-06-14  5:58 ` [PATCH 4/5] kconfig.h: allow to use IS_{ENABLE,REACHABLE} in macro expansion Masahiro Yamada
2016-06-14  5:58 ` [PATCH 5/5] vmlinux.lds.h: replace config_enabled() with IS_ENABLED() Masahiro Yamada
2016-06-20 20:45   ` Michal Marek
2016-06-20 23:20     ` Masahiro Yamada
2016-06-21  9:25       ` Arnd Bergmann
2016-06-22  6:52         ` Masahiro Yamada
2016-06-23  8:07       ` Masahiro Yamada

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).