From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH master 3/7] net: fec_mpc5200: fix false positive -Wmisleading-indentation
Date: Mon, 5 Jun 2023 08:29:35 +0200 [thread overview]
Message-ID: <20230605062939.242063-3-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230605062939.242063-1-a.fatoum@pengutronix.de>
After the preprocessor runs, the code in question looks like this:
SDMA_INT_DISABLE
while ((counter--) && (!(fec->eth->ievent & FEC_IEVENT_GRA)));
{
struct mpc5xxx_sdma *sdma = (struct mpc5xxx_sdma *)MPC5XXX_SDMA;
sdma->IntMask |= (1 << tasknum);
}
Which understandably looks like a bug. Avoid this by using do { } while
(0) and moving the semicolon to a separate line.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/powerpc/mach-mpc5xxx/include/mach/sdma.h | 25 ++++++++-----------
drivers/net/fec_mpc5200.c | 3 ++-
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/arch/powerpc/mach-mpc5xxx/include/mach/sdma.h b/arch/powerpc/mach-mpc5xxx/include/mach/sdma.h
index 02f561675a03..176ed3e892e2 100644
--- a/arch/powerpc/mach-mpc5xxx/include/mach/sdma.h
+++ b/arch/powerpc/mach-mpc5xxx/include/mach/sdma.h
@@ -49,40 +49,35 @@ ALL PARAMETERS ARE ALL LONGWORDS (FOUR BYTES EACH).
/*---------------------------------------------------------------------*/
/* Disable SmartDMA task */
-#define SDMA_TASK_DISABLE(tasknum) \
-{ \
+#define SDMA_TASK_DISABLE(tasknum) do { \
volatile ushort *tcr = (ushort *)(MPC5XXX_SDMA + 0x0000001c + 2 * tasknum); \
*tcr = (*tcr) & (~0x8000); \
-}
+} while (0)
/* Enable SmartDMA task */
-#define SDMA_TASK_ENABLE(tasknum) \
-{ \
+#define SDMA_TASK_ENABLE(tasknum) do { \
volatile ushort *tcr = (ushort *) (MPC5XXX_SDMA + 0x0000001c + 2 * tasknum); \
*tcr = (*tcr) | 0x8000; \
-}
+} while (0)
/* Enable interrupt */
-#define SDMA_INT_ENABLE(tasknum) \
-{ \
+#define SDMA_INT_ENABLE(tasknum) do { \
struct mpc5xxx_sdma *sdma = (struct mpc5xxx_sdma *)MPC5XXX_SDMA; \
sdma->IntMask &= ~(1 << tasknum); \
-}
+} while (0)
/* Disable interrupt */
-#define SDMA_INT_DISABLE(tasknum) \
-{ \
+#define SDMA_INT_DISABLE(tasknum) do { \
struct mpc5xxx_sdma *sdma = (struct mpc5xxx_sdma *)MPC5XXX_SDMA; \
sdma->IntMask |= (1 << tasknum); \
-}
+} while (0)
/* Clear interrupt pending bits */
-#define SDMA_CLEAR_IEVENT(tasknum) \
-{ \
+#define SDMA_CLEAR_IEVENT(tasknum) do { \
struct mpc5xxx_sdma *sdma = (struct mpc5xxx_sdma *)MPC5XXX_SDMA; \
sdma->IntPend = (1 << tasknum); \
-}
+} while (0)
/* get interrupt pending bit of a task */
#define SDMA_GET_PENDINGBIT(tasknum) \
diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c
index 53b5a861aeb8..9c9b795f140c 100644
--- a/drivers/net/fec_mpc5200.c
+++ b/drivers/net/fec_mpc5200.c
@@ -420,7 +420,8 @@ static void mpc5xxx_fec_halt(struct eth_device *dev)
/*
* wait for graceful stop to register
*/
- while ((counter--) && (!(fec->eth->ievent & FEC_IEVENT_GRA))) ;
+ while ((counter--) && (!(fec->eth->ievent & FEC_IEVENT_GRA)))
+ ;
/*
* Disable SmartDMA tasks
--
2.39.2
next prev parent reply other threads:[~2023-06-05 6:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-05 6:29 [PATCH master 1/7] ddr: imx8m: align function definition with prototype Ahmad Fatoum
2023-06-05 6:29 ` [PATCH master 2/7] include: bitmask: avoid -Wint-in-bool-context warning Ahmad Fatoum
2023-06-05 6:29 ` Ahmad Fatoum [this message]
2023-06-05 6:29 ` [PATCH master 4/7] net: gianfar: fix out of bounds read of local variable Ahmad Fatoum
2023-06-06 9:33 ` Sascha Hauer
2023-06-06 11:31 ` Ahmad Fatoum
2023-06-05 6:29 ` [PATCH master 5/7] MIPS: boot: main_entry: use malloc_end instead of _stext Ahmad Fatoum
2023-06-05 6:29 ` [PATCH master 6/7] MIPS: longsoon: restart: hide access to zero page Ahmad Fatoum
2023-06-05 6:29 ` [PATCH master 7/7] bootm: booti: fix false positive uninitialized variable access Ahmad Fatoum
2023-06-06 9:35 ` [PATCH master 1/7] ddr: imx8m: align function definition with prototype Sascha Hauer
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=20230605062939.242063-3-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.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