Merge branch 'break_after_return'

Fabian Frederick says:

====================
drivers/net: remove unnecessary break after return

Second patchset after "remove unnecessary break after goto" addressing break redundancy on drivers/net branch
(suggested by Joe Perches)
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

37 files changed, 0 insertions, 71 deletions

diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 29e272cc7a98..64c016a99af8 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);
diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c
index 90e825e8abfe..65cf60f6718c 100644
--- a/drivers/net/ethernet/8390/mac8390.c
+++ b/drivers/net/ethernet/8390/mac8390.c
@@ -178,10 +178,8 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev)
                 case NUBUS_DRHW_APPLE_SONIC_LC:
                 case NUBUS_DRHW_SONNET:
                         return MAC8390_NONE;
-                        break;
                 default:
                         return MAC8390_APPLE;
-                        break;
                 }
                 break;
 
@@ -189,13 +187,10 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev)
                 switch (dev->dr_hw) {
                 case NUBUS_DRHW_ASANTE_LC:
                         return MAC8390_NONE;
-                        break;
                 case NUBUS_DRHW_CABLETRON:
                         return MAC8390_CABLETRON;
-                        break;
                 default:
                         return MAC8390_APPLE;
-                        break;
                 }
                 break;
 
@@ -220,10 +215,8 @@ static enum mac8390_type __init mac8390_ident(struct nubus_dev *dev)
                 switch (dev->dr_hw) {
                 case NUBUS_DRHW_INTERLAN:
                         return MAC8390_INTERLAN;
-                        break;
                 default:
                         return MAC8390_KINETICS;
-                        break;
                 }
                 break;
 
@@ -563,7 +556,6 @@ static int __init mac8390_initdev(struct net_device *dev,
                 case ACCESS_UNKNOWN:
                         pr_err("Don't know how to access card memory!\n");
                         return -ENODEV;
-                        break;
 
                 case ACCESS_16:
                         /* 16 bit card, register map is reversed */
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
index 1cda49a28f7f..52fdfe225978 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
@@ -639,7 +639,6 @@ int atl1c_phy_init(struct atl1c_hw *hw)
                         dev_err(&pdev->dev, "Wrong Media type %d\n",
                                 hw->media_type);
                 return -1;
-                break;
         }
 
         ret_val = atl1c_write_phy_reg(hw, MII_BMCR, mii_bmcr_data);
@@ -682,7 +681,6 @@ int atl1c_get_speed_and_duplex(struct atl1c_hw *hw, u16 *speed, u16 *duplex)
                 break;
         default:
                 return -1;
-                break;
         }
 
         if (phy_data & GIGA_PSSR_DPLX)
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_hw.c b/drivers/net/ethernet/atheros/atl1e/atl1e_hw.c
index 923063d2e5bb..113565da155f 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_hw.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_hw.c
@@ -618,7 +618,6 @@ int atl1e_get_speed_and_duplex(struct atl1e_hw *hw, u16 *speed, u16 *duplex)
                 break;
         default:
                 return AT_ERR_PHY_SPEED;
-                break;
         }
 
         if (phy_data & MII_AT001_PSSR_DPLX)
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index b460db7919a2..1546d550ac97 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -910,7 +910,6 @@ static s32 atl1_get_speed_and_duplex(struct atl1_hw *hw, u16 *speed, u16 *duplex
                 if (netif_msg_hw(adapter))
                         dev_dbg(&pdev->dev, "error getting speed\n");
                 return ATLX_ERR_PHY_SPEED;
-                break;
         }
         if (phy_data & MII_ATLX_PSSR_DPLX)
                 *duplex = FULL_DUPLEX;
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 6746bd717146..c194bc687c30 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -2493,7 +2493,6 @@ static s32 atl2_get_speed_and_duplex(struct atl2_hw *hw, u16 *speed,
                 break;
         default:
                 return ATLX_ERR_PHY_SPEED;
-                break;
         }
 
         if (phy_data & MII_ATLX_PSSR_DPLX)
@@ -2933,11 +2932,9 @@ static int atl2_validate_option(int *value, struct atl2_option *opt)
                 case OPTION_ENABLED:
                         printk(KERN_INFO "%s Enabled\n", opt->name);
                         return 0;
-                        break;
                 case OPTION_DISABLED:
                         printk(KERN_INFO "%s Disabled\n", opt->name);
                         return 0;
-                        break;
                 }
                 break;
         case range_option:
diff --git a/drivers/net/ethernet/brocade/bna/cna_fwimg.c b/drivers/net/ethernet/brocade/bna/cna_fwimg.c
index 6a68e8d93309..6f72771caea6 100644
--- a/drivers/net/ethernet/brocade/bna/cna_fwimg.c
+++ b/drivers/net/ethernet/brocade/bna/cna_fwimg.c
@@ -68,10 +68,8 @@ bfa_cb_image_get_chunk(enum bfi_asic_gen asic_gen, u32 off)
         switch (asic_gen) {
         case BFI_ASIC_GEN_CT:
                 return (bfi_image_ct_cna + off);
-                break;
         case BFI_ASIC_GEN_CT2:
                 return (bfi_image_ct2_cna + off);
-                break;
         default:
                 return NULL;
         }
@@ -83,10 +81,8 @@ bfa_cb_image_get_size(enum bfi_asic_gen asic_gen)
         switch (asic_gen) {
         case BFI_ASIC_GEN_CT:
                 return bfi_image_ct_cna_size;
-                break;
         case BFI_ASIC_GEN_CT2:
                 return bfi_image_ct2_cna_size;
-                break;
         default:
                 return 0;
         }
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index c05b66dfcc30..7091fa6ed096 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -3250,7 +3250,6 @@ srom_map_media(struct net_device *dev)
         printk("%s: Bad media code [%d] detected in SROM!\n", dev->name,
                                                           lp->infoblock_media);
         return -1;
-        break;
     }
 
     return 0;
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 36fc429298e3..8ceaf7a2660c 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -2396,7 +2396,6 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (netif_msg_ifup(ugeth))
                         pr_err("Bad number of Rx threads value\n");
                 return -EINVAL;
-                break;
         }
 
         switch (ug_info->numThreadsTx) {
@@ -2419,7 +2418,6 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
                 if (netif_msg_ifup(ugeth))
                         pr_err("Bad number of Tx threads value\n");
                 return -EINVAL;
-                break;
         }
 
         /* Calculate rx_extended_features */
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
index d50f78afb56d..cca5bca44e73 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -1316,7 +1316,6 @@ static int e1000_set_phy_loopback(struct e1000_adapter *adapter)
         case e1000_82547:
         case e1000_82547_rev_2:
                 return e1000_integrated_phy_loopback(adapter);
-                break;
         default:
                 /* Default PHY loopback work is to read the MII
                  * control register and assert bit 14 (loopback mode).
@@ -1325,7 +1324,6 @@ static int e1000_set_phy_loopback(struct e1000_adapter *adapter)
                 phy_reg |= MII_CR_LOOPBACK;
                 e1000_write_phy_reg(hw, PHY_CTRL, phy_reg);
                 return 0;
-                break;
         }
 
         return 8;
@@ -1344,7 +1342,6 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
                 case e1000_82545_rev_3:
                 case e1000_82546_rev_3:
                         return e1000_set_phy_loopback(adapter);
-                        break;
                 default:
                         rctl = er32(RCTL);
                         rctl |= E1000_RCTL_LBM_TCVR;
diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c
index e9b07ccc0eba..1acf5034db10 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_hw.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c
@@ -902,7 +902,6 @@ static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw)
         default:
                 e_dbg("Flow control param set incorrectly\n");
                 return -E1000_ERR_CONFIG;
-                break;
         }
 
         /* Since auto-negotiation is enabled, take the link out of reset (the
@@ -5041,7 +5040,6 @@ static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
                         break;
                 default:
                         return -E1000_ERR_PHY;
-                        break;
                 }
         } else if (hw->phy_type == e1000_phy_igp) {     /* For IGP PHY */
                 u16 cur_agc_value;
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 218481e509f9..dc79ed85030b 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -95,7 +95,6 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw)
                 break;
         default:
                 return -E1000_ERR_PHY;
-                break;
         }
 
         /* This can only be done after all function pointers are setup. */
@@ -422,7 +421,6 @@ static s32 e1000_get_phy_id_82571(struct e1000_hw *hw)
                 break;
         case e1000_82573:
                 return e1000e_get_phy_id(hw);
-                break;
         case e1000_82574:
         case e1000_82583:
                 ret_val = e1e_rphy(hw, MII_PHYSID1, &phy_id);
@@ -440,7 +438,6 @@ static s32 e1000_get_phy_id_82571(struct e1000_hw *hw)
                 break;
         default:
                 return -E1000_ERR_PHY;
-                break;
         }
 
         return 0;
@@ -1458,7 +1455,6 @@ static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)
                 break;
         default:
                 return -E1000_ERR_PHY;
-                break;
         }
 
         if (ret_val)
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index 815e26c6d34b..865ce45f9ec3 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -1521,11 +1521,9 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
                 switch (hw->mac.type) {
                 case e1000_80003es2lan:
                         return e1000_set_es2lan_mac_loopback(adapter);
-                        break;
                 case e1000_82571:
                 case e1000_82572:
                         return e1000_set_82571_fiber_loopback(adapter);
-                        break;
                 default:
                         rctl = er32(RCTL);
                         rctl |= E1000_RCTL_LBM_TCVR;
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 8894ab8ed6bd..f236861c2a31 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -572,7 +572,6 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw)
                 break;
         default:
                 return -E1000_ERR_PHY;
-                break;
         }
 
         return 0;
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index 8c386f3a15eb..30b74d590bee 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -787,7 +787,6 @@ static s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw)
         default:
                 e_dbg("Flow control param set incorrectly\n");
                 return -E1000_ERR_CONFIG;
-                break;
         }
 
         ew32(TXCW, txcw);
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
index 72b454ce05ac..236a6183a865 100644
--- a/drivers/net/ethernet/intel/igb/e1000_82575.c
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
@@ -579,7 +579,6 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
                 break;
         default:
                 return -E1000_ERR_MAC_INIT;
-                break;
         }
 
         /* Set media type */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
index ea1c1ab926e2..75bcb2e08491 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c
@@ -460,7 +460,6 @@ static int ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num)
                         break;
                 default:
                         return -EINVAL;
-                        break;
                 }
         } else {
                 return -EINVAL;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index a452730a3278..94a1c07efeb0 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -1408,7 +1408,6 @@ static int ixgbe_reg_test(struct ixgbe_adapter *adapter, u64 *data)
         default:
                 *data = 1;
                 return 1;
-                break;
         }
 
         /*
@@ -2866,7 +2865,6 @@ static int ixgbe_get_ts_info(struct net_device *dev,
                 break;
         default:
                 return ethtool_op_get_ts_info(dev, info);
-                break;
         }
         return 0;
 }
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index 6072f093e6b4..7bea17c41dc9 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -2258,7 +2258,6 @@ static int sis900_set_config(struct net_device *dev, struct ifmap *map)
                 case IF_PORT_100BASEFX: /* 100BaseFx */
                         /* These Modes are not supported (are they?)*/
                         return -EOPNOTSUPP;
-                        break;
 
                 default:
                         return -EINVAL;
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 79606f47a08e..db8ffde491b5 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -2584,7 +2584,6 @@ static int niu_determine_phy_disposition(struct niu *np)
                                 break;
                         default:
                                 return -EINVAL;
-                                break;
                         }
                         phy_addr_off = niu_atca_port_num[np->port];
                         break;
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
index 2553ed5d2ece..0a7f2e77557f 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
@@ -1828,25 +1828,18 @@ static const char *wpasecstr(enum gelic_eurus_wpa_security sec)
         switch (sec) {
         case GELIC_EURUS_WPA_SEC_NONE:
                 return "NONE";
-                break;
         case GELIC_EURUS_WPA_SEC_WPA_TKIP_TKIP:
                 return "WPA_TKIP_TKIP";
-                break;
         case GELIC_EURUS_WPA_SEC_WPA_TKIP_AES:
                 return "WPA_TKIP_AES";
-                break;
         case GELIC_EURUS_WPA_SEC_WPA_AES_AES:
                 return "WPA_AES_AES";
-                break;
         case GELIC_EURUS_WPA_SEC_WPA2_TKIP_TKIP:
                 return "WPA2_TKIP_TKIP";
-                break;
         case GELIC_EURUS_WPA_SEC_WPA2_TKIP_AES:
                 return "WPA2_TKIP_AES";
-                break;
         case GELIC_EURUS_WPA_SEC_WPA2_AES_AES:
                 return "WPA2_AES_AES";
-                break;
         }
         return "";
 };
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index a463613a0719..43c9960dce1c 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;
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 29d88739454b..b39807579a8a 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -7818,7 +7818,6 @@ static int readrids(struct net_device *dev, aironet_ioctl *comp) {
         case AIRORRID:      ridcode = comp->ridnum;     break;
         default:
                 return -EINVAL;
-                break;
         }
 
         if ((iobuf = kmalloc(RIDSIZE, GFP_KERNEL)) == NULL)
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index d5ef211f261c..8ee7097f0b25 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -1187,7 +1187,6 @@ static int ath6kl_upload_board_file(struct ath6kl *ar)
         default:
                 WARN_ON(1);
                 return -EINVAL;
-                break;
         }
 
         if (board_ext_address &&
diff --git a/drivers/net/wireless/ath/carl9170/phy.c b/drivers/net/wireless/ath/carl9170/phy.c
index ab4ee7d39ad3..b80b2138ce3c 100644
--- a/drivers/net/wireless/ath/carl9170/phy.c
+++ b/drivers/net/wireless/ath/carl9170/phy.c
@@ -1139,7 +1139,6 @@ static int carl9170_set_freq_cal_data(struct ar9170 *ar,
 
         default:
                 return -EINVAL;
-                break;
         }
 
         for (; i >= 0; i--) {
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index 588fdbdb3255..057b982ea8b3 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 3e9f5b25be63..93869e89aa3d 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);
diff --git a/drivers/net/wireless/cw1200/fwio.c b/drivers/net/wireless/cw1200/fwio.c
index e23d67e0bfe6..6f1b9aace8b3 100644
--- a/drivers/net/wireless/cw1200/fwio.c
+++ b/drivers/net/wireless/cw1200/fwio.c
@@ -290,7 +290,6 @@ static int config_reg_write(struct cw1200_common *priv, u32 val)
         case HIF_8601_SILICON:
         default:
                 return cw1200_reg_write_32(priv, ST90TDS_CONFIG_REG_ID, val);
-                break;
         }
         return 0;
 }
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 3c0a0a86ba12..9a3d4d6724f7 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;
         }
 }
 
diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c
index 47b34bfe890a..3a8d2dbcfecd 100644
--- a/drivers/net/wireless/prism54/oid_mgt.c
+++ b/drivers/net/wireless/prism54/oid_mgt.c
@@ -793,7 +793,6 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str)
         switch (isl_oid[n].flags & OID_FLAG_TYPE) {
         case OID_TYPE_U32:
                 return snprintf(str, PRIV_STR_SIZE, "%u\n", r->u);
-                break;
         case OID_TYPE_BUFFER:{
                         struct obj_buffer *buff = r->ptr;
                         return snprintf(str, PRIV_STR_SIZE,
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index b1ed6d0796f6..56e218e0469c 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:
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c
index a9cfa13be3a8..0f9314205526 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/pwrseqcmd.c
@@ -125,7 +125,6 @@ bool rtl88_hal_pwrseqcmdparsing(struct rtl_priv *rtlpriv, u8 cut_version,
                                 RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
                                          "rtl88_hal_pwrseqcmdparsing(): PWR_CMD_END\n");
                                 return true;
-                                break;
                         default:
                                 RT_ASSERT(false,
                                           "rtl88_hal_pwrseqcmdparsing(): Unknown CMD!!\n");
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index e2736929b5d0..df98a5e4729a 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;
 
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/fw.c b/drivers/net/wireless/rtlwifi/rtl8192se/fw.c
index 73fa4a1de4df..331b1584a1a2 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 1c7101bcd790..00e067044c08 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;
 
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
index 539e53987372..662a079f76f3 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;
 
         }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c b/drivers/net/wireless/rtlwifi/rtl8723be/pwrseqcmd.c
index e4a507a756fb..4573310c707f 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(): "