e1000e: remove unnecessary break after return

Signed-off-by: Fabian Frederick <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 218481e509f99f4e32deba736ae4117365c650e3..dc79ed85030b73e8ccbbdc57c05ebe09085a4bee 100644 (file)
--- 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 815e26c6d34b85a54c554de5863e200302d6eacd..865ce45f9ec3424733dd3db43d9e635183575604 100644 (file)
--- 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 8894ab8ed6bd82de2c0f720939d31a906096a12c..f236861c2a3194a7e4a88ee57085761f6234ee84 100644 (file)
--- 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 8c386f3a15ebb6649e347f5316555827b151819b..30b74d590bee461663291d803bbfd06e042ba255 100644 (file)
--- 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);