| Message ID | 20240711084315.1507-1-thorsten.blum@toblux.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0d9c0a67b14401344183cc0f8239f8d1851637fd |
| Headers | show |
| Series | [v2] bootconfig: Remove duplicate included header file linux/bootconfig.h | expand |
On Thu, 11 Jul 2024 10:43:16 +0200 Thorsten Blum <thorsten.blum@toblux.com> wrote: > The header file linux/bootconfig.h is included whether __KERNEL__ is > defined or not. > > Include it only once before the #ifdef/#else/#endif preprocessor > directives and remove the following make includecheck warning: > > linux/bootconfig.h is included more than once > > Move the comment to the top and delete the now empty #else block. > > Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com> Thanks, looks good to me. Let me pick it up. > --- > Changes in v2: > - Move comment and delete #else as suggested by Masami Hiramatsu > - Link to v1: https://lore.kernel.org/linux-kernel/20240711002152.800028-2-thorsten.blum@toblux.com/ > --- > lib/bootconfig.c | 20 +++++++++----------- > 1 file changed, 9 insertions(+), 11 deletions(-) > > diff --git a/lib/bootconfig.c b/lib/bootconfig.c > index 97f8911ea339..81f29c29f47b 100644 > --- a/lib/bootconfig.c > +++ b/lib/bootconfig.c > @@ -4,8 +4,16 @@ > * Masami Hiramatsu <mhiramat@kernel.org> > */ > > -#ifdef __KERNEL__ > +/* > + * NOTE: This is only for tools/bootconfig, because tools/bootconfig will > + * run the parser sanity test. > + * This does NOT mean lib/bootconfig.c is available in the user space. > + * However, if you change this file, please make sure the tools/bootconfig > + * has no issue on building and running. > + */ > #include <linux/bootconfig.h> > + > +#ifdef __KERNEL__ > #include <linux/bug.h> > #include <linux/ctype.h> > #include <linux/errno.h> > @@ -24,16 +32,6 @@ const char * __init xbc_get_embedded_bootconfig(size_t *size) > return (*size) ? embedded_bootconfig_data : NULL; > } > #endif > - > -#else /* !__KERNEL__ */ > -/* > - * NOTE: This is only for tools/bootconfig, because tools/bootconfig will > - * run the parser sanity test. > - * This does NOT mean lib/bootconfig.c is available in the user space. > - * However, if you change this file, please make sure the tools/bootconfig > - * has no issue on building and running. > - */ > -#include <linux/bootconfig.h> > #endif > > /* > -- > 2.39.2 >
diff --git a/lib/bootconfig.c b/lib/bootconfig.c index 97f8911ea339..81f29c29f47b 100644 --- a/lib/bootconfig.c +++ b/lib/bootconfig.c @@ -4,8 +4,16 @@ * Masami Hiramatsu <mhiramat@kernel.org> */ -#ifdef __KERNEL__ +/* + * NOTE: This is only for tools/bootconfig, because tools/bootconfig will + * run the parser sanity test. + * This does NOT mean lib/bootconfig.c is available in the user space. + * However, if you change this file, please make sure the tools/bootconfig + * has no issue on building and running. + */ #include <linux/bootconfig.h> + +#ifdef __KERNEL__ #include <linux/bug.h> #include <linux/ctype.h> #include <linux/errno.h> @@ -24,16 +32,6 @@ const char * __init xbc_get_embedded_bootconfig(size_t *size) return (*size) ? embedded_bootconfig_data : NULL; } #endif - -#else /* !__KERNEL__ */ -/* - * NOTE: This is only for tools/bootconfig, because tools/bootconfig will - * run the parser sanity test. - * This does NOT mean lib/bootconfig.c is available in the user space. - * However, if you change this file, please make sure the tools/bootconfig - * has no issue on building and running. - */ -#include <linux/bootconfig.h> #endif /*
The header file linux/bootconfig.h is included whether __KERNEL__ is defined or not. Include it only once before the #ifdef/#else/#endif preprocessor directives and remove the following make includecheck warning: linux/bootconfig.h is included more than once Move the comment to the top and delete the now empty #else block. Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com> --- Changes in v2: - Move comment and delete #else as suggested by Masami Hiramatsu - Link to v1: https://lore.kernel.org/linux-kernel/20240711002152.800028-2-thorsten.blum@toblux.com/ --- lib/bootconfig.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-)