Second patchset after "remove unnecessary break after goto" addressing break redundancy on drivers/net branch
(suggested by Joe Perches)
Fabian Frederick (30):
dlci: remove unnecessary break after return
eth_v10: remove unnecessary break after return
brcm80211: remove unnecessary break after return
mwl8k: remove unnecessary break after return
rtlwifi: remove unnecessary break after return
rtlwifi: rtl8192ce: remove unnecessary break after return
rtlwifi: rtl8192se: remove unnecessary break after return
rtlwifi: rtl8723ae: remove unnecessary break after return
rtlwifi: rtl8723be: remove unnecessary break after return
rtlwifi: rtl8188ee: remove unnecessary break after return
prism54: remove unnecessary break after return
cw1200: remove unnecessary break after return
airo: remove unnecessary break after return
ath6kl: remove unnecessary break after return
carl9170: remove unnecessary break after return
i40e: remove unnecessary break after return
e1000: remove unnecessary break after return
ixgbe: remove unnecessary break after return
e1000e: remove unnecessary break after return
igb: remove unnecessary break after return
8390: remove unnecessary break after return
net: tulip: remove unnecessary break after return
bna: remove unnecessary break after return
sis900: remove unnecessary break after return
niu: remove unnecessary break after return
ucc_geth: remove unnecessary break after return
atl1e: remove unnecessary break after return
atlx: remove unnecessary break after return
atl1c: remove unnecessary break after return
ps3_gelic: remove unnecessary break after return
drivers/net/cris/eth_v10.c | 1 -
drivers/net/ethernet/8390/mac8390.c | 8 --------
drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 --
drivers/net/ethernet/atheros/atl1e/atl1e_hw.c | 1 -
drivers/net/ethernet/atheros/atlx/atl1.c | 1 -
drivers/net/ethernet/atheros/atlx/atl2.c | 3 ---
drivers/net/ethernet/brocade/bna/cna_fwimg.c | 4 ----
drivers/net/ethernet/dec/tulip/de4x5.c | 1 -
drivers/net/ethernet/freescale/ucc_geth.c | 2 --
drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 3 ---
drivers/net/ethernet/intel/e1000/e1000_hw.c | 2 --
drivers/net/ethernet/intel/e1000e/82571.c | 4 ----
drivers/net/ethernet/intel/e1000e/ethtool.c | 2 --
drivers/net/ethernet/intel/e1000e/ich8lan.c | 1 -
drivers/net/ethernet/intel/e1000e/mac.c | 1 -
drivers/net/ethernet/intel/i40e/i40e_common.c | 1 -
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 1 -
drivers/net/ethernet/intel/igb/e1000_82575.c | 1 -
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 1 -
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 --
drivers/net/ethernet/sis/sis900.c | 1 -
drivers/net/ethernet/sun/niu.c | 1 -
drivers/net/ethernet/toshiba/ps3_gelic_wireless.c | 7 -------
drivers/net/wan/dlci.c | 1 -
drivers/net/wireless/airo.c | 1 -
drivers/net/wireless/ath/ath6kl/init.c | 1 -
drivers/net/wireless/ath/carl9170/phy.c | 1 -
drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 1 -
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 1 -
drivers/net/wireless/cw1200/fwio.c | 1 -
drivers/net/wireless/mwl8k.c | 5 -----
drivers/net/wireless/prism54/oid_mgt.c | 1 -
drivers/net/wireless/rtlwifi/core.c | 1 -
drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c | 1 -
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 1 -
drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 3 ---
drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 1 -
drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 1 -
drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c | 1 -
39 files changed, 73 deletions(-)
--
1.9.1
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/net/wan/dlci.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 19f7cb2..7ebfafe 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -255,7 +255,6 @@ static int dlci_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return -EINVAL;
return dlci_config(dev, ifr->ifr_data, cmd == DLCI_GET_CONF);
- break;
default:
return -EOPNOTSUPP;
--
1.9.1
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/net/cris/eth_v10.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 29e272c..64c016a 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -1496,7 +1496,6 @@ e100_set_config(struct net_device *dev, struct ifmap *map)
case IF_PORT_AUI:
spin_unlock(&np->lock);
return -EOPNOTSUPP;
- break;
default:
printk(KERN_ERR "%s: Invalid media selected", dev->name);
spin_unlock(&np->lock);
--
1.9.1
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 1 -
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index f3445ac..c563c65 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
@@ -2364,7 +2364,6 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)
return 0;
default:
return -ENOTSUPP;
- break;
}
clear_bit(BRCMF_P2P_STATUS_GO_NEG_PHASE, &p2p->status);
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index 3e9f5b2..93869e8 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -22916,7 +22916,6 @@ static void wlc_phy_rssi_cal_nphy_rev2(struct brcms_phy *pi, u8 rssi_type)
break;
default:
return;
- break;
}
classif_state = wlc_phy_classifier_nphy(pi, 0, 0);
--
1.9.1
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/net/wireless/mwl8k.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 3c0a0a8..9a3d4d6 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -1633,22 +1633,17 @@ static int mwl8k_tid_queue_mapping(u8 tid)
case 0:
case 3:
return IEEE80211_AC_BE;
- break;
case 1:
case 2:
return IEEE80211_AC_BK;
- break;
case 4:
case 5:
return IEEE80211_AC_VI;
- break;
case 6:
case 7:
return IEEE80211_AC_VO;
- break;
default:
return -1;
- break;
}
}
--
1.9.1
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/net/wireless/rtlwifi/core.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index b1ed6d0..56e218e 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -1064,7 +1064,6 @@ static int rtl_op_ampdu_action(struct ieee80211_hw *hw,
RT_TRACE(rtlpriv, COMP_MAC80211, DBG_TRACE,
"IEEE80211_AMPDU_TX_START: TID:%d\n", tid);
return rtl_tx_agg_start(hw, sta, tid, ssn);
- break;
case IEEE80211_AMPDU_TX_STOP_CONT:
case IEEE80211_AMPDU_TX_STOP_FLUSH:
case IEEE80211_AMPDU_TX_STOP_FLUSH_CONT:
--
1.9.1
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index cdecb0f..0c43c8f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -1200,7 +1200,6 @@ static int _rtl92ce_set_media_status(struct ieee80211_hw *hw,
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
"Network type %d not supported!\n", type);
return 1;
- break;
}
--
1.9.1
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 3 ---
drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 1 -
2 files changed, 4 deletions(-)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c
index 380e7d4..b15aa5c 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c
@@ -112,13 +112,10 @@ static u8 _rtl92s_firmware_header_map_rftype(struct ieee80211_hw *hw)
switch (rtlphy->rf_type) {
case RF_1T1R:
return 0x11;
- break;
case RF_1T2R:
return 0x12;
- break;
case RF_2T2R:
return 0x22;
- break;
default:
RT_TRACE(rtlpriv, COMP_INIT, DBG_EMERG, "Unknown RF type(%x)\n",
rtlphy->rf_type);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index 1c7101b..00e0670 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -1198,7 +1198,6 @@ static int _rtl92se_set_media_status(struct ieee80211_hw *hw,
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
"Network type %d not supported!\n", type);
return 1;
- break;
}
--
1.9.1
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
index 87f6916..27cb76f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
@@ -1103,7 +1103,6 @@ static int _rtl8723ae_set_media_status(struct ieee80211_hw *hw,
"Network type %d not supported!\n",
type);
return 1;
- break;
}
--
1.9.1
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c b/drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c
index e4a507a..4573310 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c
@@ -124,7 +124,6 @@ bool rtlbe_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
"rtlbe_hal_pwrseqcmdparsing(): "
"PWR_CMD_END\n");
return true;
- break;
default:
RT_ASSERT(false,
"rtlbe_hal_pwrseqcmdparsing(): "
--
1.9.1
From: Fabian Frederick <[email protected]>
Date: Sun, 20 Jul 2014 16:16:08 +0200
> Second patchset after "remove unnecessary break after goto" addressing break redundancy on drivers/net branch
> (suggested by Joe Perches)
All applied except the i40e patch, which did not apply to net-next at all.
> On 21 July 2014 at 06:31 David Miller <[email protected]> wrote:
>
>
> From: Fabian Frederick <[email protected]>
> Date: Sun, 20 Jul 2014 16:16:08 +0200
>
> > Second patchset after "remove unnecessary break after goto" addressing break
> > redundancy on drivers/net branch
> > (suggested by Joe Perches)
>
> All applied except the i40e patch, which did not apply to net-next at all.
Thanks a lot David.
Fabian