From: "Cédric Le Goater" <clg@kaod.org>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: "Christophe Leroy" <christophe.leroy@c-s.fr>,
"Jordan Niethe" <jniethe5@gmail.com>,
linuxppc-dev@lists.ozlabs.org, "Cédric Le Goater" <clg@kaod.org>
Subject: [PATCH v2 3/7] powerpc/sstep: Remove empty if statement checking for invalid form
Date: Mon, 14 Sep 2020 23:10:03 +0200 [thread overview]
Message-ID: <20200914211007.2285999-4-clg@kaod.org> (raw)
In-Reply-To: <20200914211007.2285999-1-clg@kaod.org>
The check should be performed by the caller. This fixes a compile
error with W=1.
../arch/powerpc/lib/sstep.c: In function ‘mlsd_8lsd_ea’:
../arch/powerpc/lib/sstep.c:225:3: error: suggest braces around empty body in an ‘if’ statement [-Werror=empty-body]
; /* Invalid form. Should already be checked for by caller! */
^
Cc: Jordan Niethe <jniethe5@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
arch/powerpc/lib/sstep.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index caee8cc77e19..e9dcaba9a4f8 100644
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -219,10 +219,13 @@ static nokprobe_inline unsigned long mlsd_8lsd_ea(unsigned int instr,
ea += regs->gpr[ra];
else if (!prefix_r && !ra)
; /* Leave ea as is */
- else if (prefix_r && !ra)
+ else if (prefix_r)
ea += regs->nip;
- else if (prefix_r && ra)
- ; /* Invalid form. Should already be checked for by caller! */
+
+ /*
+ * (prefix_r && ra) is an invalid form. Should already be
+ * checked for by caller!
+ */
return ea;
}
--
2.25.4
next prev parent reply other threads:[~2020-09-14 21:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 21:10 [PATCH v2 0/7] powerpc: Fix a few W=1 compile warnings Cédric Le Goater
2020-09-14 21:10 ` [PATCH v2 1/7] powerpc/sysfs: Remove unused 'err' variable in sysfs_create_dscr_default() Cédric Le Goater
2020-09-14 21:10 ` [PATCH v2 2/7] powerpc/prom: Introduce early_reserve_mem_old() Cédric Le Goater
2020-09-15 16:46 ` Christophe Leroy
2020-09-16 5:56 ` Cédric Le Goater
2020-09-14 21:10 ` Cédric Le Goater [this message]
2020-09-14 21:10 ` [PATCH v2 4/7] powerpc/xive: Make debug routines static Cédric Le Goater
2020-09-14 21:10 ` [PATCH v2 5/7] powerpc/powernv/pci: Remove unused variable 'parent' in pnv_ioda_configure_pe() Cédric Le Goater
2020-09-14 21:10 ` [PATCH v2 6/7] powerpc/perf: Remove unused variable 'target' in trace_imc_event_init() Cédric Le Goater
2020-09-17 12:20 ` Athira Rajeev
2020-09-14 21:10 ` [PATCH v2 7/7] powerpc/32: Declare stack_overflow_exception() prototype Cédric Le Goater
2020-09-24 12:27 ` [PATCH v2 0/7] powerpc: Fix a few W=1 compile warnings Michael Ellerman
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=20200914211007.2285999-4-clg@kaod.org \
--to=clg@kaod.org \
--cc=christophe.leroy@c-s.fr \
--cc=jniethe5@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/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;
as well as URLs for NNTP newsgroup(s).