From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Geert Uytterhoeven <geert@linux-m68k.org>,
"Gustavo A. R. Silva" <gustavo@embeddedor.com>
Cc: linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2][next] m68k: amiga: config: Mark expected switch fall-through
Date: Thu, 26 Mar 2020 18:29:09 -0500 [thread overview]
Message-ID: <14ff577604d25243c8a897f851b436ba87ae87cb.1585264062.git.gustavo@embeddedor.com> (raw)
In-Reply-To: <cover.1585264062.git.gustavo@embeddedor.com>
Mark switch cases where we are expecting to fall through.
This patch fixes the following warning (Building: allmodconfig m68k):
arch/m68k/amiga/config.c: In function ‘amiga_identify’:
./arch/m68k/include/asm/amigahw.h:42:50: warning: this statement may fall through [-Wimplicit-fallthrough=]
#define AMIGAHW_SET(name) (amiga_hw_present.name = 1)
~~~~~~~~~~~~~~~~~~~~~~~^~~~
arch/m68k/amiga/config.c:223:3: note: in expansion of macro ‘AMIGAHW_SET’
AMIGAHW_SET(PCMCIA);
^~~~~~~~~~~
arch/m68k/amiga/config.c:224:2: note: here
case AMI_500:
^~~~
Replace the existing /* fall through */ comments and fix the issue above
by using the new pseudo-keyword fallthrough;
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
arch/m68k/amiga/config.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 06c15374200e..4eb911d64e8d 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -221,6 +221,7 @@ static void __init amiga_identify(void)
case AMI_1200:
AMIGAHW_SET(A1200_IDE);
AMIGAHW_SET(PCMCIA);
+ fallthrough;
case AMI_500:
case AMI_500PLUS:
case AMI_1000:
@@ -233,7 +234,7 @@ static void __init amiga_identify(void)
case AMI_3000T:
AMIGAHW_SET(AMBER_FF);
AMIGAHW_SET(MAGIC_REKICK);
- /* fall through */
+ fallthrough;
case AMI_3000PLUS:
AMIGAHW_SET(A3000_SCSI);
AMIGAHW_SET(A3000_CLK);
@@ -242,7 +243,7 @@ static void __init amiga_identify(void)
case AMI_4000T:
AMIGAHW_SET(A4000_SCSI);
- /* fall through */
+ fallthrough;
case AMI_4000:
AMIGAHW_SET(A4000_IDE);
AMIGAHW_SET(A3000_CLK);
--
2.26.0
next prev parent reply other threads:[~2020-03-26 23:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-26 23:23 [PATCH 0/2][next] m68k: amiga: config: Use flexible-array member and mark expected switch fall-through Gustavo A. R. Silva
2020-03-26 23:29 ` Gustavo A. R. Silva [this message]
2020-04-20 7:17 ` [PATCH 2/2][next] m68k: amiga: config: Mark " Geert Uytterhoeven
2020-04-20 16:07 ` Gustavo A. R. Silva
2020-04-20 17:48 ` Geert Uytterhoeven
2020-04-20 18:15 ` Gustavo A. R. Silva
2020-04-20 18:14 ` [PATCH RESEND 1/2][next] m68k: amiga: config: Replace zero-length array with flexible-array member Gustavo A. R. Silva
2020-04-21 7:06 ` Geert Uytterhoeven
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=14ff577604d25243c8a897f851b436ba87ae87cb.1585264062.git.gustavo@embeddedor.com \
--to=gustavo@embeddedor.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.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;
as well as URLs for NNTP newsgroup(s).