mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Qian Cai <cai@lca.pw>
To: mpe@ellerman.id.au
Cc: paulus@samba.org, benh@kernel.crashing.org,
	linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
	Qian Cai <cai@lca.pw>
Subject: [PATCH] powerpc/setup_64: fix -Wempty-body warnings
Date: Wed,  5 Jun 2019 16:17:55 -0400	[thread overview]
Message-ID: <1559765875-6328-1-git-send-email-cai@lca.pw> (raw)

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 <cai@lca.pw>
---
 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


             reply	other threads:[~2019-06-05 20:18 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-05 20:17 Qian Cai [this message]
2019-06-05 20:33 ` Tyrel Datwyler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1559765875-6328-1-git-send-email-cai@lca.pw \
    --to=cai@lca.pw \
    --cc=benh@kernel.crashing.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®