Skip to contentSkip to conversation

staging: vt6656: key: Mark expected switch fall-throughs

PATCH New Gustavo A. R. Silva 1 participant 1 message Feb 18, 2019 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: vt6656: key: Mark expected switch fall-throughs

In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.

This patch fixes the following warnings:

drivers/staging/vt6656/key.c: In function ‘vnt_set_keymode’:
drivers/staging/vt6656/key.c:70:19: warning: this statement may fall through [-Wimplicit-fallthrough=]
key->hw_key_idx = entry;
~~~~~~~~~~~~~~~~^~~~~~~
drivers/staging/vt6656/key.c:71:2: note: here
case VNT_KEY_ALLGROUP:
^~~~
drivers/staging/vt6656/key.c:73:6: warning: this statement may fall through [-Wimplicit-fallthrough=]
if (onfly_latch)

      ^

drivers/staging/vt6656/key.c:75:2: note: here
case VNT_KEY_GROUP_ADDRESS:
^~~~
drivers/staging/vt6656/key.c:76:12: warning: this statement may fall through [-Wimplicit-fallthrough=]
key_mode |= mode;
~~~~~~~~~^~~~~~~
drivers/staging/vt6656/key.c:77:2: note: here
case VNT_KEY_GROUP:
^~~~

Warning level 3 was used: -Wimplicit-fallthrough=3

This patch is part of the ongoing efforts to enable -Wimplicit-fallthrough.

---
 drivers/staging/vt6656/key.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/vt6656/key.c +3 -1
index 91dede54cc1f..dcd933a6b66e 100644
@@ -63,17 +63,19 @@ static int vnt_set_keymode(struct ieee80211_hw *hw, u8 *mac_addr,
 	}
 
 	switch (key_type) {
-		/* fallthrough */
 	case VNT_KEY_DEFAULTKEY:
 		/* default key last entry */
 		entry = MAX_KEY_TABLE - 1;
 		key->hw_key_idx = entry;
+		/* fall through */
 	case VNT_KEY_ALLGROUP:
 		key_mode |= VNT_KEY_ALLGROUP;
 		if (onfly_latch)
 			key_mode |= VNT_KEY_ONFLY_ALL;
+		/* fall through */
 	case VNT_KEY_GROUP_ADDRESS:
 		key_mode |= mode;
+		/* fall through */
 	case VNT_KEY_GROUP:
 		key_mode |= (mode << 4);
 		key_mode |= VNT_KEY_GROUP;
Signature · 1 line
2.20.1