]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
rtw88: phy: mark expected switch fall-throughs
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Wed, 1 May 2019 15:16:15 +0000 (10:16 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 2 May 2019 14:58:53 +0000 (17:58 +0300)
In preparation to enabling -Wimplicit-fallthrough, mark switch
cases where we are expecting to fall through.

This patch fixes the following warnings:

drivers/net/wireless/realtek/rtw88/phy.c: In function ‘rtw_get_channel_group’:
./include/linux/compiler.h:77:22: warning: this statement may fall through [-Wimplicit-fallthrough=]
 # define unlikely(x) __builtin_expect(!!(x), 0)
                      ^~~~~~~~~~~~~~~~~~~~~~~~~~
./include/asm-generic/bug.h:125:2: note: in expansion of macro ‘unlikely’
  unlikely(__ret_warn_on);     \
  ^~~~~~~~
drivers/net/wireless/realtek/rtw88/phy.c:907:3: note: in expansion of macro ‘WARN_ON’
   WARN_ON(1);
   ^~~~~~~
drivers/net/wireless/realtek/rtw88/phy.c:908:2: note: here
  case 1:
  ^~~~
In file included from ./include/linux/bcd.h:5,
                 from drivers/net/wireless/realtek/rtw88/phy.c:5:
drivers/net/wireless/realtek/rtw88/phy.c: In function ‘phy_get_2g_tx_power_index’:
./include/linux/compiler.h:77:22: warning: this statement may fall through [-Wimplicit-fallthrough=]
 # define unlikely(x) __builtin_expect(!!(x), 0)
                      ^~~~~~~~~~~~~~~~~~~~~~~~~~
./include/asm-generic/bug.h:125:2: note: in expansion of macro ‘unlikely’
  unlikely(__ret_warn_on);     \
  ^~~~~~~~
drivers/net/wireless/realtek/rtw88/phy.c:1021:3: note: in expansion of macro ‘WARN_ON’
   WARN_ON(1);
   ^~~~~~~
drivers/net/wireless/realtek/rtw88/phy.c:1022:2: note: here
  case RTW_CHANNEL_WIDTH_20:
  ^~~~

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: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/realtek/rtw88/phy.c

index 35a35dbca85f1bc3a9476ee8c5193dfe8b297183..4381b360b5b5358cc49b93b1aebe6cbaf304f4dd 100644 (file)
@@ -905,6 +905,7 @@ static u8 rtw_get_channel_group(u8 channel)
        switch (channel) {
        default:
                WARN_ON(1);
+               /* fall through */
        case 1:
        case 2:
        case 36:
@@ -1019,6 +1020,7 @@ static u8 phy_get_2g_tx_power_index(struct rtw_dev *rtwdev,
        switch (bandwidth) {
        default:
                WARN_ON(1);
+               /* fall through */
        case RTW_CHANNEL_WIDTH_20:
                tx_power += pwr_idx_2g->ht_1s_diff.bw20 * factor;
                if (above_2ss)
@@ -1062,6 +1064,7 @@ static u8 phy_get_5g_tx_power_index(struct rtw_dev *rtwdev,
        switch (bandwidth) {
        default:
                WARN_ON(1);
+               /* fall through */
        case RTW_CHANNEL_WIDTH_20:
                tx_power += pwr_idx_5g->ht_1s_diff.bw20 * factor;
                if (above_2ss)