]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
powerpc: Move `path` variable inside DEBUG_PROM
authorMathieu Malaterre <malat@debian.org>
Wed, 4 Apr 2018 20:08:35 +0000 (22:08 +0200)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 10 Aug 2018 12:12:38 +0000 (22:12 +1000)
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@c-s.fr>
Signed-off-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/prom_init.c

index 0433bf24a10d68b1bbf0b2d0ed12007dcd677c8c..9b38a2e5dd3576cd5023093e2655c4d6f6835a9d 100644 (file)
@@ -628,7 +628,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;
@@ -1421,7 +1421,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;
@@ -1442,7 +1445,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;