From: David Laight <David.Laight@ACULAB.COM>
To: 'Jiri Kosina' <jikos@kernel.org>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>,
"linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-hardening@vger.kernel.org"
<linux-hardening@vger.kernel.org>
Subject: RE: [PATCH 063/141] HID: input: Fix fall-through warnings for Clang
Date: Wed, 25 Nov 2020 13:34:53 +0000 [thread overview]
Message-ID: <93bac7a8ac704a248b4f9877391e4a4f@AcuMS.aculab.com> (raw)
In-Reply-To: <nycvar.YFH.7.76.2011251403390.3441@cbobk.fhfr.pm>
From: Jiri Kosina <jikos@kernel.org>
> Sent: 25 November 2020 13:04
> On Fri, 20 Nov 2020, Gustavo A. R. Silva wrote:
>
> > In preparation to enable -Wimplicit-fallthrough for Clang, fix a warning
> > by explicitly adding a goto statement instead of letting the code fall
> > through to the next case.
> >
> > Link: https://github.com/KSPP/linux/issues/115
> > Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
> > ---
> > drivers/hid/hid-input.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
> > index 9770db624bfa..37601b800a2e 100644
> > --- a/drivers/hid/hid-input.c
> > +++ b/drivers/hid/hid-input.c
> > @@ -743,6 +743,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
> > field->flags |= HID_MAIN_ITEM_RELATIVE;
> > break;
> > }
> > + goto unknown;
> >
> > default: goto unknown;
>
> This makes my eyes hurt :) But adding the annotation would be ugly as
> well, so let me just take it as-is.
case HID_GD_RFKILL_BTN:
/* MS wireless radio ctl extension, also check CA */
if (field->application == HID_GD_WIRELESS_RADIO_CTLS) {
map_key_clear(KEY_RFKILL);
/* We need to simulate the btn release */
field->flags |= HID_MAIN_ITEM_RELATIVE;
break;
}
It might be best to invert the condition and de-indent the code.
case HID_GD_RFKILL_BTN:
/* MS wireless radio ctl extension, also check CA */
if (field->application != HID_GD_WIRELESS_RADIO_CTLS)
goto unknown;
map_key_clear(KEY_RFKILL);
/* We need to simulate the btn release */
field->flags |= HID_MAIN_ITEM_RELATIVE;
break;
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
Registration No: 1397386 (Wales)
next prev parent reply other threads:[~2020-11-25 13:35 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 18:21 [PATCH 000/141] Fix fall-through warnings for Clang Gustavo A. R. Silva
2020-11-20 18:28 ` Joe Perches
2020-11-20 19:02 ` Gustavo A. R. Silva
2020-11-20 18:30 ` [PATCH 037/141] Input: pcspkr - " Gustavo A. R. Silva
2020-11-23 6:15 ` Dmitry Torokhov
2020-11-23 22:48 ` Gustavo A. R. Silva
2020-11-20 18:33 ` [PATCH 062/141] HID: usbhid: " Gustavo A. R. Silva
2020-11-25 13:02 ` Jiri Kosina
2020-11-20 18:33 ` [PATCH 063/141] HID: input: " Gustavo A. R. Silva
2020-11-25 13:04 ` Jiri Kosina
2020-11-25 13:34 ` David Laight [this message]
2020-11-20 18:41 ` [PATCH 141/141] Input: libps2 - " Gustavo A. R. Silva
2020-11-23 6:16 ` Dmitry Torokhov
2020-11-24 14:44 ` Gustavo A. R. Silva
2020-11-20 18:53 ` [PATCH 000/141] " Jakub Kicinski
2020-11-20 19:04 ` Gustavo A. R. Silva
2020-11-20 19:30 ` Kees Cook
2020-11-20 19:51 ` Jakub Kicinski
2020-11-20 20:48 ` Kees Cook
2020-11-22 16:17 ` Kees Cook
2020-11-22 18:21 ` James Bottomley
2020-11-22 18:25 ` Joe Perches
2020-11-22 19:12 ` James Bottomley
2020-11-22 19:22 ` Joe Perches
2020-11-22 19:53 ` James Bottomley
2020-11-23 13:03 ` [Intel-wired-lan] " Gustavo A. R. Silva
2020-11-23 16:31 ` James Bottomley
2020-11-24 21:32 ` Kees Cook
2020-11-24 22:24 ` Finn Thain
2020-11-24 23:15 ` Miguel Ojeda
2020-11-24 23:53 ` Finn Thain
2020-11-25 1:05 ` Miguel Ojeda
2020-11-25 7:05 ` James Bottomley
2020-11-25 12:24 ` Nick Desaulniers
2020-11-25 21:33 ` Finn Thain
2020-11-25 22:09 ` Nick Desaulniers
2020-11-25 23:21 ` Finn Thain
2020-11-26 0:30 ` Finn Thain
[not found] ` <20201125082405.1d8c23dc@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
2020-11-25 17:04 ` Miguel Ojeda
2020-11-25 22:09 ` Nick Desaulniers
2020-11-25 21:10 ` Kees Cook
2020-11-22 20:35 ` Miguel Ojeda
2020-11-22 22:36 ` James Bottomley
2020-11-23 14:19 ` Miguel Ojeda
2020-11-23 15:58 ` James Bottomley
2020-11-23 16:24 ` Rafael J. Wysocki
2020-11-23 16:32 ` Joe Perches
2020-11-23 18:56 ` Miguel Ojeda
2020-11-23 20:37 ` James Bottomley
2020-11-25 0:32 ` Miguel Ojeda
2020-11-25 22:44 ` Edward Cree
2020-11-26 14:53 ` Miguel Ojeda
2020-11-26 15:28 ` Geert Uytterhoeven
2020-11-26 16:18 ` Karol Herbst
2020-11-26 17:05 ` Miguel Ojeda
2020-11-25 10:38 ` Andy Shevchenko
2020-11-25 9:01 ` Sean Young
2020-11-22 22:54 ` Finn Thain
2020-11-22 23:04 ` James Bottomley
2020-11-23 14:05 ` Miguel Ojeda
2020-11-24 0:58 ` Finn Thain
2020-11-24 1:05 ` Joe Perches
2020-11-24 2:48 ` Finn Thain
2020-11-24 23:46 ` Miguel Ojeda
2020-11-22 22:10 ` Sam Ravnborg
2020-11-24 1:32 ` Nick Desaulniers
2020-11-24 21:25 ` Kees Cook
2020-11-25 23:02 ` Edward Cree
2020-12-01 14:08 ` Dan Carpenter
2020-12-01 14:04 ` Dan Carpenter
2020-11-20 22:21 ` Miguel Ojeda
2020-11-23 20:03 ` Jason Gunthorpe
2020-11-24 14:47 ` Gustavo A. R. Silva
[not found] ` <160616392671.21180.16517492185091399884.b4-ty@kernel.org>
2020-11-24 14:47 ` Gustavo A. R. Silva
2020-12-01 5:52 ` Martin K. Petersen
2020-12-01 8:20 ` Gustavo A. R. Silva
2020-12-08 4:52 ` (subset) " Martin K. Petersen
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=93bac7a8ac704a248b4f9877391e4a4f@AcuMS.aculab.com \
--to=david.laight@aculab.com \
--cc=benjamin.tissoires@redhat.com \
--cc=gustavoars@kernel.org \
--cc=jikos@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.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;
as well as URLs for NNTP newsgroup(s).