| Message ID | 1561730629-5025-1-git-send-email-cai@lca.pw (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3] powerpc/setup_64: fix -Wempty-body warnings | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (c7d64b560ce80d8c44f082eee8352f0778a73195) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 11 lines checked |
Ping. On Fri, 2019-06-28 at 10:03 -0400, Qian Cai wrote: > At the beginning of setup_64.c, it has, > > #ifdef DEBUG > #define DBG(fmt...) udbg_printf(fmt) > #else > #define DBG(fmt...) > #endif > > where DBG() could be compiled away, and generate warnings, > > arch/powerpc/kernel/setup_64.c: In function 'initialize_cache_info': > arch/powerpc/kernel/setup_64.c:579:49: warning: suggest braces around > empty body in an 'if' statement [-Wempty-body] > DBG("Argh, can't find dcache properties !\n"); > ^ > arch/powerpc/kernel/setup_64.c:582:49: warning: suggest braces around > empty body in an 'if' statement [-Wempty-body] > DBG("Argh, can't find icache properties !\n"); > > Fix it by using the no_printk() macro, and make sure that format and > argument are always verified by the compiler. > > Suggested-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> > Suggested-by: Joe Perches <joe@perches.com> > Signed-off-by: Qian Cai <cai@lca.pw> > --- > > v3: Use no_printk() macro, and make sure that format and argument are always > verified by the compiler using a more generic form ##__VA_ARGS__ per Joe. > > v2: Fix it by using a NOP while loop per Tyrel. > > arch/powerpc/kernel/setup_64.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c > index 44b4c432a273..cea933a43f0a 100644 > --- a/arch/powerpc/kernel/setup_64.c > +++ b/arch/powerpc/kernel/setup_64.c > @@ -69,9 +69,9 @@ > #include "setup.h" > > #ifdef DEBUG > -#define DBG(fmt...) udbg_printf(fmt) > +#define DBG(fmt, ...) udbg_printf(fmt, ##__VA_ARGS__) > #else > -#define DBG(fmt...) > +#define DBG(fmt, ...) no_printk(fmt, ##__VA_ARGS__) > #endif > > int spinning_secondaries;
Qian Cai <cai@lca.pw> writes: > At the beginning of setup_64.c, it has, > > #ifdef DEBUG > #define DBG(fmt...) udbg_printf(fmt) > #else > #define DBG(fmt...) > #endif > > where DBG() could be compiled away, and generate warnings, > > arch/powerpc/kernel/setup_64.c: In function 'initialize_cache_info': > arch/powerpc/kernel/setup_64.c:579:49: warning: suggest braces around > empty body in an 'if' statement [-Wempty-body] > DBG("Argh, can't find dcache properties !\n"); > ^ > arch/powerpc/kernel/setup_64.c:582:49: warning: suggest braces around > empty body in an 'if' statement [-Wempty-body] > DBG("Argh, can't find icache properties !\n"); Neither of those sites should use DBG(), that's not really early boot code, they should just use pr_warn(). And the other uses of DBG() in initialize_cache_info() should just be removed. In smp_release_cpus() the entry/exit DBG's should just be removed, and the spinning_secondaries line should just be pr_debug(). That would just leave the two calls in early_setup(). If we taught udbg_printf() to return early when udbg_putc is NULL, then we could just call udbg_printf() unconditionally and get rid of the DBG macro entirely. cheers
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 44b4c432a273..cea933a43f0a 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -69,9 +69,9 @@ #include "setup.h" #ifdef DEBUG -#define DBG(fmt...) udbg_printf(fmt) +#define DBG(fmt, ...) udbg_printf(fmt, ##__VA_ARGS__) #else -#define DBG(fmt...) +#define DBG(fmt, ...) no_printk(fmt, ##__VA_ARGS__) #endif int spinning_secondaries;
At the beginning of setup_64.c, it has, #ifdef DEBUG #define DBG(fmt...) udbg_printf(fmt) #else #define DBG(fmt...) #endif where DBG() could be compiled away, and generate warnings, arch/powerpc/kernel/setup_64.c: In function 'initialize_cache_info': arch/powerpc/kernel/setup_64.c:579:49: warning: suggest braces around empty body in an 'if' statement [-Wempty-body] DBG("Argh, can't find dcache properties !\n"); ^ arch/powerpc/kernel/setup_64.c:582:49: warning: suggest braces around empty body in an 'if' statement [-Wempty-body] DBG("Argh, can't find icache properties !\n"); Fix it by using the no_printk() macro, and make sure that format and argument are always verified by the compiler. Suggested-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com> Suggested-by: Joe Perches <joe@perches.com> Signed-off-by: Qian Cai <cai@lca.pw> --- v3: Use no_printk() macro, and make sure that format and argument are always verified by the compiler using a more generic form ##__VA_ARGS__ per Joe. v2: Fix it by using a NOP while loop per Tyrel. arch/powerpc/kernel/setup_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)