diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-06-14 01:58:56 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.com> | 2016-06-20 16:42:32 -0400 |
| commit | 05a25c8e2c593914c18faf91dfb5ee471b79ce58 (patch) | |
| tree | f64abab9f35df9120c805c3825b6d32987b4d61d | |
| parent | 6023d2369ba7b82b0588fd6fcdd558a6fef200ae (diff) | |
kconfig.h: use already defined macros for IS_REACHABLE() define
For the same reason as commit 02d699f1f464 ("include/linux/kconfig.h:
ese macros which are already defined"), it is better to use macros
IS_BUILTIN() and IS_MODULE() for defining IS_REACHABLE().
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
| -rw-r--r-- | include/linux/kconfig.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h index a94b5bf57f51..722c7d2c48d6 100644 --- a/include/linux/kconfig.h +++ b/include/linux/kconfig.h | |||
| @@ -42,8 +42,8 @@ | |||
| 42 | * This is similar to IS_ENABLED(), but returns false when invoked from | 42 | * This is similar to IS_ENABLED(), but returns false when invoked from |
| 43 | * built-in code when CONFIG_FOO is set to 'm'. | 43 | * built-in code when CONFIG_FOO is set to 'm'. |
| 44 | */ | 44 | */ |
| 45 | #define IS_REACHABLE(option) (config_enabled(option) || \ | 45 | #define IS_REACHABLE(option) (IS_BUILTIN(option) || \ |
| 46 | (config_enabled(option##_MODULE) && __is_defined(MODULE))) | 46 | (IS_MODULE(option) && __is_defined(MODULE))) |
| 47 | 47 | ||
| 48 | /* | 48 | /* |
| 49 | * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm', | 49 | * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm', |
