From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Sebastian Reichel <sre@kernel.org>
Cc: linux-kernel@vger.kernel.org,
"Gustavo A. R. Silva" <gustavo@embeddedor.com>,
Kees Cook <keescook@chromium.org>
Subject: [PATCH] HSI: ssi_protocol: Mark expected switch fall-throughs
Date: Mon, 29 Jul 2019 17:45:19 -0500 [thread overview]
Message-ID: <20190729224519.GA23078@embeddedor> (raw)
Mark switch cases where we are expecting to fall through.
This patch fixes the following warning (Building: arm):
drivers/hsi/clients/ssi_protocol.c: In function ‘ssip_set_rxstate’:
drivers/hsi/clients/ssi_protocol.c:291:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (atomic_read(&ssi->tx_usecnt))
^
drivers/hsi/clients/ssi_protocol.c:294:2: note: here
case RECEIVING:
^~~~
drivers/hsi/clients/ssi_protocol.c: In function ‘ssip_keep_alive’:
drivers/hsi/clients/ssi_protocol.c:466:7: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (atomic_read(&ssi->tx_usecnt) == 0)
^
drivers/hsi/clients/ssi_protocol.c:472:3: note: here
case SEND_IDLE:
^~~~
Notice that, in this particular case, the code comment is
modified in accordance with what GCC is expecting to find.
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
drivers/hsi/clients/ssi_protocol.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c
index 9aeed98b87a1..504d00ec1ea7 100644
--- a/drivers/hsi/clients/ssi_protocol.c
+++ b/drivers/hsi/clients/ssi_protocol.c
@@ -290,7 +290,7 @@ static void ssip_set_rxstate(struct ssi_protocol *ssi, unsigned int state)
/* CMT speech workaround */
if (atomic_read(&ssi->tx_usecnt))
break;
- /* Otherwise fall through */
+ /* Else, fall through */
case RECEIVING:
mod_timer(&ssi->keep_alive, jiffies +
msecs_to_jiffies(SSIP_KATOUT));
@@ -465,9 +465,10 @@ static void ssip_keep_alive(struct timer_list *t)
case SEND_READY:
if (atomic_read(&ssi->tx_usecnt) == 0)
break;
+ /* Fall through */
/*
- * Fall through. Workaround for cmt-speech
- * in that case we relay on audio timers.
+ * Workaround for cmt-speech in that case
+ * we relay on audio timers.
*/
case SEND_IDLE:
spin_unlock(&ssi->lock);
--
2.22.0
next reply other threads:[~2019-07-29 22:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-29 22:45 Gustavo A. R. Silva [this message]
2019-07-30 16:58 ` [PATCH] HSI: ssi_protocol: Mark expected switch fall-throughs Kees Cook
2019-07-30 20:15 ` Sebastian Reichel
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=20190729224519.GA23078@embeddedor \
--to=gustavo@embeddedor.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sre@kernel.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