[PATCH v3 03/19] powerpc: Move `path` variable inside DEBUG_PROM

Mathieu Malaterre malat at debian.org
Fri Jun 22 19:48:02 AEST 2018


This one should be ok.

On Wed, Apr 4, 2018 at 10:08 PM Mathieu Malaterre <malat at debian.org> wrote:
>
> Add gcc attribute unused for two variables. Fix warnings treated as errors
> with W=1:
>
>   arch/powerpc/kernel/prom_init.c:1388:8: error: variable ‘path’ set but not used [-Werror=unused-but-set-variable]
>
> Suggested-by: Christophe Leroy <christophe.leroy at c-s.fr>
> Signed-off-by: Mathieu Malaterre <malat at debian.org>
> ---
> v3: really move path within ifdef DEBUG_PROM
> v2: move path within ifdef DEBUG_PROM
>
>  arch/powerpc/kernel/prom_init.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
> index acf4b2e0530c..223b35acbbdd 100644
> --- a/arch/powerpc/kernel/prom_init.c
> +++ b/arch/powerpc/kernel/prom_init.c
> @@ -603,7 +603,7 @@ static void __init early_cmdline_parse(void)
>         const char *opt;
>
>         char *p;
> -       int l = 0;
> +       int l __maybe_unused = 0;
>
>         prom_cmd_line[0] = 0;
>         p = prom_cmd_line;
> @@ -1385,7 +1385,10 @@ static void __init reserve_mem(u64 base, u64 size)
>  static void __init prom_init_mem(void)
>  {
>         phandle node;
> -       char *path, type[64];
> +#ifdef DEBUG_PROM
> +       char *path;
> +#endif
> +       char type[64];
>         unsigned int plen;
>         cell_t *p, *endp;
>         __be32 val;
> @@ -1406,7 +1409,9 @@ static void __init prom_init_mem(void)
>         prom_debug("root_size_cells: %x\n", rsc);
>
>         prom_debug("scanning memory:\n");
> +#ifdef DEBUG_PROM
>         path = prom_scratch;
> +#endif
>
>         for (node = 0; prom_next_node(&node); ) {
>                 type[0] = 0;
> --
> 2.11.0
>


More information about the Linuxppc-dev mailing list