[PATCH] powerpc/setup_64: fix -Wempty-body warnings

2019-06-05 Thread Qian Cai
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");

Signed-off-by: Qian Cai 
---
 arch/powerpc/kernel/setup_64.c | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 44b4c432a273..23758834324f 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -575,12 +575,13 @@ void __init initialize_cache_info(void)
 * d-cache and i-cache sizes... -Peter
 */
if (cpu) {
-   if (!parse_cache_info(cpu, false, &ppc64_caches.l1d))
+   /* Add an extra brace to silence -Wempty-body warnings. */
+   if (!parse_cache_info(cpu, false, &ppc64_caches.l1d)) {
DBG("Argh, can't find dcache properties !\n");
-
-   if (!parse_cache_info(cpu, true, &ppc64_caches.l1i))
+   }
+   if (!parse_cache_info(cpu, true, &ppc64_caches.l1i)) {
DBG("Argh, can't find icache properties !\n");
-
+   }
/*
 * Try to find the L2 and L3 if any. Assume they are
 * unified and use the D-side properties.
-- 
1.8.3.1



Re: [PATCH] powerpc/setup_64: fix -Wempty-body warnings

2019-06-05 Thread Tyrel Datwyler
On 06/05/2019 01:17 PM, 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

Simpler solution is just to define the debug in the else clause as such:

#define DBG(fmt...) do { } while(0)

-Tyrel

> 
> 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");
> 
> Signed-off-by: Qian Cai 
> ---
>  arch/powerpc/kernel/setup_64.c | 9 +
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
> index 44b4c432a273..23758834324f 100644
> --- a/arch/powerpc/kernel/setup_64.c
> +++ b/arch/powerpc/kernel/setup_64.c
> @@ -575,12 +575,13 @@ void __init initialize_cache_info(void)
>* d-cache and i-cache sizes... -Peter
>*/
>   if (cpu) {
> - if (!parse_cache_info(cpu, false, &ppc64_caches.l1d))
> + /* Add an extra brace to silence -Wempty-body warnings. */
> + if (!parse_cache_info(cpu, false, &ppc64_caches.l1d)) {
>   DBG("Argh, can't find dcache properties !\n");
> -
> - if (!parse_cache_info(cpu, true, &ppc64_caches.l1i))
> + }
> + if (!parse_cache_info(cpu, true, &ppc64_caches.l1i)) {
>   DBG("Argh, can't find icache properties !\n");
> -
> + }
>   /*
>* Try to find the L2 and L3 if any. Assume they are
>* unified and use the D-side properties.
>