diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-07-20 10:25:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-21 00:30:17 -0400 |
commit | 4097ae93b8e01a669ac2c7f3fdda52295bbc8f1d (patch) | |
tree | c1df3feb417da4b914453c1e6d90081f362aefa8 | |
parent | 3f0a4c1d401d1ed5d2055d45428091fc24fd7cc4 (diff) |
e1000: remove unnecessary break after return
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_hw.c | 2 |
2 files changed, 0 insertions, 5 deletions
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) | |||
1316 | case e1000_82547: | 1316 | case e1000_82547: |
1317 | case e1000_82547_rev_2: | 1317 | case e1000_82547_rev_2: |
1318 | return e1000_integrated_phy_loopback(adapter); | 1318 | return e1000_integrated_phy_loopback(adapter); |
1319 | break; | ||
1320 | default: | 1319 | default: |
1321 | /* Default PHY loopback work is to read the MII | 1320 | /* Default PHY loopback work is to read the MII |
1322 | * control register and assert bit 14 (loopback mode). | 1321 | * control register and assert bit 14 (loopback mode). |
@@ -1325,7 +1324,6 @@ static int e1000_set_phy_loopback(struct e1000_adapter *adapter) | |||
1325 | phy_reg |= MII_CR_LOOPBACK; | 1324 | phy_reg |= MII_CR_LOOPBACK; |
1326 | e1000_write_phy_reg(hw, PHY_CTRL, phy_reg); | 1325 | e1000_write_phy_reg(hw, PHY_CTRL, phy_reg); |
1327 | return 0; | 1326 | return 0; |
1328 | break; | ||
1329 | } | 1327 | } |
1330 | 1328 | ||
1331 | return 8; | 1329 | return 8; |
@@ -1344,7 +1342,6 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter) | |||
1344 | case e1000_82545_rev_3: | 1342 | case e1000_82545_rev_3: |
1345 | case e1000_82546_rev_3: | 1343 | case e1000_82546_rev_3: |
1346 | return e1000_set_phy_loopback(adapter); | 1344 | return e1000_set_phy_loopback(adapter); |
1347 | break; | ||
1348 | default: | 1345 | default: |
1349 | rctl = er32(RCTL); | 1346 | rctl = er32(RCTL); |
1350 | rctl |= E1000_RCTL_LBM_TCVR; | 1347 | 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) | |||
902 | default: | 902 | default: |
903 | e_dbg("Flow control param set incorrectly\n"); | 903 | e_dbg("Flow control param set incorrectly\n"); |
904 | return -E1000_ERR_CONFIG; | 904 | return -E1000_ERR_CONFIG; |
905 | break; | ||
906 | } | 905 | } |
907 | 906 | ||
908 | /* Since auto-negotiation is enabled, take the link out of reset (the | 907 | /* 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, | |||
5041 | break; | 5040 | break; |
5042 | default: | 5041 | default: |
5043 | return -E1000_ERR_PHY; | 5042 | return -E1000_ERR_PHY; |
5044 | break; | ||
5045 | } | 5043 | } |
5046 | } else if (hw->phy_type == e1000_phy_igp) { /* For IGP PHY */ | 5044 | } else if (hw->phy_type == e1000_phy_igp) { /* For IGP PHY */ |
5047 | u16 cur_agc_value; | 5045 | u16 cur_agc_value; |