summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo A. R. Silva <gustavo@embeddedor.com>2019-02-18 12:52:01 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-02-19 11:14:14 +0100
commit3623d4defff057a1129aa565969af879ce4e5edf (patch)
tree3f083aa200f9add1402d7f3a8a7fd0d1818767a0
parent880cbfa02406af395a120dc758259c892053006e (diff)
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. Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6656/key.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c
index 91dede54cc1f..dcd933a6b66e 100644
--- a/drivers/staging/vt6656/key.c
+++ b/drivers/staging/vt6656/key.c
@@ -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;