Re: [RFC][PATCH] kconfig: Add implicit CONFIG_ prefix to IS_ENABLED() and co

Mike Rapoport
2022-06-28T10:29:13Z

On Tue, Jun 28, 2022 at 11:56:10AM +0200, Peter Zijlstra wrote:
>
> Since IS_ENABLED() (and friends) are clearly meant to be used on
> CONFIG_foo symbols and IS_ENABLED(CONFIG_ is so long and almost an
> tautology, allow the more compact usage of: IS_ENABLED(foo).
>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>

FWIW:
Reviewed-by: Mike Rapoport <rppt@linux.ibm.com>

> ---
>
> With this on, something like:
>
> for i in IS_BUILTIN IS_MODULE IS_REACHABLE IS_ENABLED;
> do
> git grep -wl $i | while read file;
> do
> sed -ie "s/${i}(CONFIG_/${i}(/g" $file;
> done;
> done
>
> can be used to convert all existing instance. Allowing, after time
> passes, to remove the CONFIG_ usage if so desired.
>
> ---
> tools/include/linux/kconfig.h | 7 ++++---
> include/linux/kconfig.h | 7 ++++---
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> --- a/include/linux/kconfig.h
> +++ b/include/linux/kconfig.h
> @@ -38,6 +38,7 @@
> * When CONFIG_BOOGER is not defined, we generate a (... 1, 0) pair, and when
> * the last step cherry picks the 2nd arg, we get a zero.
> */
> +#define _is_defined(x) __or(__is_defined(x), __is_defined(CONFIG_##x))
> #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)
> @@ -47,14 +48,14 @@
> * otherwise. For boolean options, this is equivalent to
> * IS_ENABLED(CONFIG_FOO).
> */
> -#define IS_BUILTIN(option) __is_defined(option)
> +#define IS_BUILTIN(option) _is_defined(option)
>
> /*
> * IS_MODULE(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'm', 0
> * otherwise. CONFIG_FOO=m results in "#define CONFIG_FOO_MODULE 1" in
> * autoconf.h.
> */
> -#define IS_MODULE(option) __is_defined(option##_MODULE)
> +#define IS_MODULE(option) _is_defined(option##_MODULE)
>
> /*
> * IS_REACHABLE(CONFIG_FOO) evaluates to 1 if the currently compiled
> @@ -63,7 +64,7 @@
> * built-in code when CONFIG_FOO is set to 'm'.
> */
> #define IS_REACHABLE(option) __or(IS_BUILTIN(option), \
> - __and(IS_MODULE(option), __is_defined(MODULE)))
> + __and(IS_MODULE(option), _is_defined(MODULE)))
>
> /*
> * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
> --- a/tools/include/linux/kconfig.h
> +++ b/tools/include/linux/kconfig.h
> @@ -32,6 +32,7 @@
> * When CONFIG_BOOGER is not defined, we generate a (... 1, 0) pair, and when
> * the last step cherry picks the 2nd arg, we get a zero.
> */
> +#define _is_defined(x) __or(__is_defined(x), __is_defined(CONFIG_##x))
> #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)
> @@ -41,13 +42,13 @@
> * otherwise. For boolean options, this is equivalent to
> * IS_ENABLED(CONFIG_FOO).
> */
> -#define IS_BUILTIN(option) __is_defined(option)
> +#define IS_BUILTIN(option) _is_defined(option)
>
> /*
> * IS_MODULE(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'm', 0
> * otherwise.
> */
> -#define IS_MODULE(option) __is_defined(option##_MODULE)
> +#define IS_MODULE(option) _is_defined(option##_MODULE)
>
> /*
> * IS_REACHABLE(CONFIG_FOO) evaluates to 1 if the currently compiled
> @@ -56,7 +57,7 @@
> * built-in code when CONFIG_FOO is set to 'm'.
> */
> #define IS_REACHABLE(option) __or(IS_BUILTIN(option), \
> - __and(IS_MODULE(option), __is_defined(MODULE)))
> + __and(IS_MODULE(option), _is_defined(MODULE)))
>
> /*
> * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
>

--
Sincerely yours,
Mike.