[PATCH] bootconfig: Remove duplicate included header file linux/bootconfig.h

[PATCH] bootconfig: Remove duplicate included header file linux/bootconfig.h

[Thorsten Blum]

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

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
---
 lib/bootconfig.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index 97f8911ea339..297871455db5 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -4,8 +4,9 @@
  * Masami Hiramatsu <mhiramat@kernel.org>
  */
 
-#ifdef __KERNEL__
 #include <linux/bootconfig.h>
+
+#ifdef __KERNEL__
 #include <linux/bug.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
@@ -33,7 +34,6 @@ const char * __init xbc_get_embedded_bootconfig(size_t *size)
  * 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.45.2

Re: [PATCH] bootconfig: Remove duplicate included header file linux/bootconfig.h

[Masami Hiramatsu]

On Thu, 11 Jul 2024 02:21:53 +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
> 

OK, but this leaves only a comment in !__KERNEL__ part.
That comment should be moved and updated too. Please move this on the top of
this file and remove `!__KERNEL__` part.

/*
 * NOTE: This file is also used by tools/bootconfig, because tools/bootconfig
 * will run the parser for sanity test.
 * This does NOT mean lib/bootconfig.c is always available in the user space.
 * However, if you change this file, please make sure the tools/bootconfig
 * has no issue on building and running.
 */

Thank you,

> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
> ---
>  lib/bootconfig.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/bootconfig.c b/lib/bootconfig.c
> index 97f8911ea339..297871455db5 100644
> --- a/lib/bootconfig.c
> +++ b/lib/bootconfig.c
> @@ -4,8 +4,9 @@
>   * Masami Hiramatsu <mhiramat@kernel.org>
>   */
>  
> -#ifdef __KERNEL__
>  #include <linux/bootconfig.h>
> +
> +#ifdef __KERNEL__
>  #include <linux/bug.h>
>  #include <linux/ctype.h>
>  #include <linux/errno.h>
> @@ -33,7 +34,6 @@ const char * __init xbc_get_embedded_bootconfig(size_t *size)
>   * 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.45.2
> 


-- 
Masami Hiramatsu (Google) <mhiramat@kernel.org>