Mark expected switch fall-throughs and fix missing break
Subsystems (3)
cover Mark expected switch fall-throughs and fix missing break
In preparation to enabling -Wimplicit-fallthrough, this patchset aims to mark multiple switch cases where we are expecting to fall through.
Also, the second patch in this series fixes a missing break in switch.
Thanks
Gustavo A. R. Silva (2):
rtl8xxxu: Mark expected switch fall-throughs
rtl8xxxu: Fix missing break in switch
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 5 +++++ 1 file changed, 5 insertions(+)
Signature · 1 line
2.7.4
PATCH 1/2 rtl8xxxu: Mark expected switch fall-throughs
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.
Addresses-Coverity-ID: 1357355 ("Missing break in switch")
Addresses-Coverity-ID: 1357378 ("Missing break in switch")
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +4 -0
@@ -1153,6 +1153,7 @@ void rtl8xxxu_gen1_config_channel(struct ieee80211_hw *hw)switch (hw->conf.chandef.width) {case NL80211_CHAN_WIDTH_20_NOHT : ht = false; +/* fall through */ case NL80211_CHAN_WIDTH_20 : opmode |=BW_OPMODE_20MHZ ;rtl8xxxu_write8 (priv,REG_BW_OPMODE , opmode);
@@ -1280,6 +1281,7 @@ void rtl8xxxu_gen2_config_channel(struct ieee80211_hw *hw)switch (hw->conf.chandef.width) {case NL80211_CHAN_WIDTH_20_NOHT : ht = false; +/* fall through */ case NL80211_CHAN_WIDTH_20 : rf_mode_bw |=WMAC_TRXPTCL_CTL_BW_20 ; subchannel =0 ;
@@ -1748,9 +1750,11 @@ static int rtl8xxxu_identify_chip(struct rtl8xxxu_priv *priv)case 3 : priv->ep_tx_low_queue =1 ; priv->ep_tx_count++; +/* fall through */ case 2 : priv->ep_tx_normal_queue =1 ; priv->ep_tx_count++; +/* fall through */ case 1 : priv->ep_tx_high_queue =1 ; priv->ep_tx_count++;
Signature · 1 line
2.7.4
Re: [PATCH 1/2] rtl8xxxu: Mark expected switch fall-throughs
Quoted 6 lines · Gustavo A. R. Silva
In preparation to enabling -Wimplicit-fallthrough, mark switch cases where we are expecting to fall through.
Addresses-Coverity-ID: 1357355 ("Missing break in switch")
Addresses-Coverity-ID: 1357378 ("Missing break in switch")Signed-off-by Gustavo A. R. Silva <[email protected]>
2 patches applied to wireless-drivers-next.git, thanks.
e20c50cdca19 rtl8xxxu: Mark expected switch fall-throughs 307b00c5e695 rtl8xxxu: Fix missing break in switch
Signature · 3 lines
https://patchwork.kernel.org/patch/10651953/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 2/2 rtl8xxxu: Fix missing break in switch
In reply to Gustavo A. R. SilvaAdd missing break statement in order to prevent the code from falling through to the default case.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +1 -0
@@ -5692,6 +5692,7 @@ static int rtl8xxxu_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,break ;case WLAN_CIPHER_SUITE_TKIP : key->flags |=IEEE80211_KEY_FLAG_GENERATE_MMIC ; +break ;default :return -EOPNOTSUPP ; }
Signature · 1 line
2.7.4
Jes Sorensen
maintainerQuoted 4 lines · Gustavo A. R. Silva
In preparation to enabling -Wimplicit-fallthrough, this patchset aims to mark multiple switch cases where we are expecting to fall through.
Also, the second patch in this series fixes a missing break in switch.
Enabling that sounds like a great way to inflict pain and suffering.
Not a big deal to put that in the code, the second patch looks fine though.
Jes
Quoted 8 lines · Jes Sorensen
Quoted 4 lines · Gustavo A. R. Silva
In preparation to enabling -Wimplicit-fallthrough, this patchset aims to mark multiple switch cases where we are expecting to fall through.
Also, the second patch in this series fixes a missing break in switch.
Enabling that sounds like a great way to inflict pain and suffering.
Not really. The -Wimplicit-fallthrough will be enabled until after all the current warnings have been addressed.
There are 600 of these issues left. So, hopefully I will complete this task during the next development cycle.
Thanks
--
Gustavo