* [PATCH] wireless: remove unneeded break
@ 2020-10-19 15:05 trix
2020-10-19 15:14 ` Christian Lamparter
0 siblings, 1 reply; 5+ messages in thread
From: trix @ 2020-10-19 15:05 UTC (permalink / raw)
To: kvalo, davem, kuba, mcoquelin.stm32, alexandre.torgue,
ath9k-devel, johannes.berg, emmanuel.grumbach, luciano.coelho,
linuxwifi, chunkeey, pkshih, sara.sharon, tova.mussai,
nathan.errera, lior2.cohen, john, shaul.triebitz,
shahar.s.matityahu, Larry.Finger, zhengbin13, christophe.jaillet,
yanaijie, joe, saurav.girepunje
Cc: netdev, linux-wireless, linux-kernel, ath10k, Tom Rix,
linux-stm32, linux-arm-kernel
From: Tom Rix <trix@redhat.com>
A break is not needed if it is preceded by a return or goto
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/net/wireless/ath/ath10k/htt_rx.c | 1 -
drivers/net/wireless/ath/ath6kl/testmode.c | 1 -
drivers/net/wireless/ath/ath9k/hw.c | 1 -
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 --
drivers/net/wireless/intersil/p54/eeprom.c | 1 -
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 1 -
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 1 -
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 3 ---
8 files changed, 11 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 5c1af2021883..9c4e6cf2137a 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -3878,7 +3878,6 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
return ath10k_htt_rx_proc_rx_frag_ind(htt,
&resp->rx_frag_ind,
skb);
- break;
}
case HTT_T2H_MSG_TYPE_TEST:
break;
diff --git a/drivers/net/wireless/ath/ath6kl/testmode.c b/drivers/net/wireless/ath/ath6kl/testmode.c
index f3906dbe5495..89c7c4e25169 100644
--- a/drivers/net/wireless/ath/ath6kl/testmode.c
+++ b/drivers/net/wireless/ath/ath6kl/testmode.c
@@ -94,7 +94,6 @@ int ath6kl_tm_cmd(struct wiphy *wiphy, struct wireless_dev *wdev,
return 0;
- break;
case ATH6KL_TM_CMD_RX_REPORT:
default:
return -EOPNOTSUPP;
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 6609ce122e6e..b66eeb577272 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2308,7 +2308,6 @@ void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period)
ath_dbg(ath9k_hw_common(ah), BEACON,
"%s: unsupported opmode: %d\n", __func__, ah->opmode);
return;
- break;
}
REG_WRITE(ah, AR_BEACON_PERIOD, beacon_period);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index cbdebefb854a..8698ca4d30de 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -1202,13 +1202,11 @@ static int iwl_mvm_mac_ctx_send(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
return iwl_mvm_mac_ctxt_cmd_sta(mvm, vif, action,
force_assoc_off,
bssid_override);
- break;
case NL80211_IFTYPE_AP:
if (!vif->p2p)
return iwl_mvm_mac_ctxt_cmd_ap(mvm, vif, action);
else
return iwl_mvm_mac_ctxt_cmd_go(mvm, vif, action);
- break;
case NL80211_IFTYPE_MONITOR:
return iwl_mvm_mac_ctxt_cmd_listener(mvm, vif, action);
case NL80211_IFTYPE_P2P_DEVICE:
diff --git a/drivers/net/wireless/intersil/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c
index 5bd35c147e19..3ca9d26df174 100644
--- a/drivers/net/wireless/intersil/p54/eeprom.c
+++ b/drivers/net/wireless/intersil/p54/eeprom.c
@@ -870,7 +870,6 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
} else {
goto good_eeprom;
}
- break;
default:
break;
}
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
index 63f9ea21962f..bd9160b166c5 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
@@ -1226,7 +1226,6 @@ static int _rtl88ee_set_media_status(struct ieee80211_hw *hw,
default:
pr_err("Network type %d not support!\n", type);
return 1;
- break;
}
/* MSR_INFRA == Link in infrastructure network;
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
index a36dc6e726d2..f8a1de6e9849 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
@@ -1132,7 +1132,6 @@ static int _rtl8723e_set_media_status(struct ieee80211_hw *hw,
default:
pr_err("Network type %d not support!\n", type);
return 1;
- break;
}
/* MSR_INFRA == Link in infrastructure network;
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
index f41a7643b9c4..225b8cd44f23 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
@@ -2085,12 +2085,10 @@ bool rtl8812ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
return __rtl8821ae_phy_config_with_headerfile(hw,
radioa_array_table_a, radioa_arraylen_a,
_rtl8821ae_config_rf_radio_a);
- break;
case RF90_PATH_B:
return __rtl8821ae_phy_config_with_headerfile(hw,
radioa_array_table_b, radioa_arraylen_b,
_rtl8821ae_config_rf_radio_b);
- break;
case RF90_PATH_C:
case RF90_PATH_D:
pr_err("switch case %#x not processed\n", rfpath);
@@ -2116,7 +2114,6 @@ bool rtl8821ae_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
return __rtl8821ae_phy_config_with_headerfile(hw,
radioa_array_table, radioa_arraylen,
_rtl8821ae_config_rf_radio_a);
- break;
case RF90_PATH_B:
case RF90_PATH_C:
--
2.18.1
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] wireless: remove unneeded break
2020-10-19 15:05 [PATCH] wireless: remove unneeded break trix
@ 2020-10-19 15:14 ` Christian Lamparter
2020-10-19 15:21 ` Joe Perches
0 siblings, 1 reply; 5+ messages in thread
From: Christian Lamparter @ 2020-10-19 15:14 UTC (permalink / raw)
To: trix, kvalo, davem, kuba, mcoquelin.stm32, alexandre.torgue,
ath9k-devel, johannes.berg, emmanuel.grumbach, luciano.coelho,
linuxwifi, chunkeey, pkshih, sara.sharon, tova.mussai,
nathan.errera, lior2.cohen, john, shaul.triebitz,
shahar.s.matityahu, Larry.Finger, zhengbin13, christophe.jaillet,
yanaijie, joe, saurav.girepunje
Cc: netdev, linux-wireless, linux-kernel, ath10k, linux-stm32,
linux-arm-kernel
On 19/10/2020 17:05, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
>
> A break is not needed if it is preceded by a return or goto
>
> Signed-off-by: Tom Rix <trix@redhat.com>
> diff --git a/drivers/net/wireless/intersil/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c
> index 5bd35c147e19..3ca9d26df174 100644
> --- a/drivers/net/wireless/intersil/p54/eeprom.c
> +++ b/drivers/net/wireless/intersil/p54/eeprom.c
> @@ -870,7 +870,6 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
> } else {
> goto good_eeprom;
> }
> - break;
Won't the compiler (gcc) now complain about a missing fallthrough annotation?
> default:
> break;
> }
Cheers,
Christian
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] wireless: remove unneeded break
2020-10-19 15:14 ` Christian Lamparter
@ 2020-10-19 15:21 ` Joe Perches
2020-10-19 15:54 ` Gustavo A. R. Silva
0 siblings, 1 reply; 5+ messages in thread
From: Joe Perches @ 2020-10-19 15:21 UTC (permalink / raw)
To: Christian Lamparter, trix, kvalo, davem, kuba, mcoquelin.stm32,
alexandre.torgue, ath9k-devel, johannes.berg, emmanuel.grumbach,
luciano.coelho, linuxwifi, chunkeey, pkshih, sara.sharon,
tova.mussai, nathan.errera, lior2.cohen, john, shaul.triebitz,
shahar.s.matityahu, Larry.Finger, zhengbin13, christophe.jaillet,
yanaijie, saurav.girepunje
Cc: netdev, linux-wireless, linux-kernel, ath10k, linux-stm32,
linux-arm-kernel
On Mon, 2020-10-19 at 17:14 +0200, Christian Lamparter wrote:
> On 19/10/2020 17:05, trix@redhat.com wrote:
> > From: Tom Rix <trix@redhat.com>
> >
> > A break is not needed if it is preceded by a return or goto
> >
> > Signed-off-by: Tom Rix <trix@redhat.com>
> > diff --git a/drivers/net/wireless/intersil/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c
> > index 5bd35c147e19..3ca9d26df174 100644
> > --- a/drivers/net/wireless/intersil/p54/eeprom.c
> > +++ b/drivers/net/wireless/intersil/p54/eeprom.c
> > @@ -870,7 +870,6 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
> > } else {
> > goto good_eeprom;
> > }
> > - break;
> Won't the compiler (gcc) now complain about a missing fallthrough annotation?
> > default:
> > break;
> > }
No, though the code would be clearer like:
---
diff --git a/drivers/net/wireless/intersil/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c
index 5bd35c147e19..233fa072d96d 100644
--- a/drivers/net/wireless/intersil/p54/eeprom.c
+++ b/drivers/net/wireless/intersil/p54/eeprom.c
@@ -867,10 +867,8 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
"test!\n");
err = -ENOMSG;
goto err;
- } else {
- goto good_eeprom;
}
- break;
+ goto good_eeprom;
default:
break;
}
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] wireless: remove unneeded break
2020-10-19 15:21 ` Joe Perches
@ 2020-10-19 15:54 ` Gustavo A. R. Silva
[not found] ` <5964d734e81c198421bb7f6516dabcad37c1740d.camel@perches.com>
0 siblings, 1 reply; 5+ messages in thread
From: Gustavo A. R. Silva @ 2020-10-19 15:54 UTC (permalink / raw)
To: Joe Perches, Christian Lamparter, trix, kvalo, davem, kuba,
mcoquelin.stm32, alexandre.torgue, ath9k-devel, johannes.berg,
emmanuel.grumbach, luciano.coelho, linuxwifi, chunkeey, pkshih,
sara.sharon, tova.mussai, nathan.errera, lior2.cohen, john,
shaul.triebitz, shahar.s.matityahu, Larry.Finger, zhengbin13,
christophe.jaillet, yanaijie, saurav.girepunje
Cc: netdev, linux-wireless, linux-kernel, ath10k, linux-stm32,
linux-arm-kernel
On 10/19/20 10:21, Joe Perches wrote:
> On Mon, 2020-10-19 at 17:14 +0200, Christian Lamparter wrote:
>> On 19/10/2020 17:05, trix@redhat.com wrote:
>>> From: Tom Rix <trix@redhat.com>
>>>
>>> A break is not needed if it is preceded by a return or goto
>>>
>>> Signed-off-by: Tom Rix <trix@redhat.com>
>>> diff --git a/drivers/net/wireless/intersil/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c
>>> index 5bd35c147e19..3ca9d26df174 100644
>>> --- a/drivers/net/wireless/intersil/p54/eeprom.c
>>> +++ b/drivers/net/wireless/intersil/p54/eeprom.c
>>> @@ -870,7 +870,6 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
>>> } else {
>>> goto good_eeprom;
>>> }
>>> - break;
>> Won't the compiler (gcc) now complain about a missing fallthrough annotation?
Clang would definitely complain about this.
>>> default:
>>> break;
>>> }
>
> No, though the code would be clearer like:
> ---
> diff --git a/drivers/net/wireless/intersil/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c
> index 5bd35c147e19..233fa072d96d 100644
> --- a/drivers/net/wireless/intersil/p54/eeprom.c
> +++ b/drivers/net/wireless/intersil/p54/eeprom.c
> @@ -867,10 +867,8 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
> "test!\n");
> err = -ENOMSG;
> goto err;
> - } else {
> - goto good_eeprom;
> }
> - break;
> + goto good_eeprom;
> default:
> break;
> }
>
>
This is much better because it'd avoid any complain from Clang.
--
Gustavo
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-10-19 16:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-19 15:05 [PATCH] wireless: remove unneeded break trix
2020-10-19 15:14 ` Christian Lamparter
2020-10-19 15:21 ` Joe Perches
2020-10-19 15:54 ` Gustavo A. R. Silva
[not found] ` <5964d734e81c198421bb7f6516dabcad37c1740d.camel@perches.com>
2020-10-19 16:38 ` Gustavo A. R. Silva
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox