Commit 4097ae93 authored by Fabian Frederick's avatar Fabian Frederick Committed by David S. Miller
Browse files

e1000: remove unnecessary break after return


Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f0a4c1d
...@@ -1316,7 +1316,6 @@ static int e1000_set_phy_loopback(struct e1000_adapter *adapter) ...@@ -1316,7 +1316,6 @@ static int e1000_set_phy_loopback(struct e1000_adapter *adapter)
case e1000_82547: case e1000_82547:
case e1000_82547_rev_2: case e1000_82547_rev_2:
return e1000_integrated_phy_loopback(adapter); return e1000_integrated_phy_loopback(adapter);
break;
default: default:
/* Default PHY loopback work is to read the MII /* Default PHY loopback work is to read the MII
* control register and assert bit 14 (loopback mode). * control register and assert bit 14 (loopback mode).
...@@ -1325,7 +1324,6 @@ static int e1000_set_phy_loopback(struct e1000_adapter *adapter) ...@@ -1325,7 +1324,6 @@ static int e1000_set_phy_loopback(struct e1000_adapter *adapter)
phy_reg |= MII_CR_LOOPBACK; phy_reg |= MII_CR_LOOPBACK;
e1000_write_phy_reg(hw, PHY_CTRL, phy_reg); e1000_write_phy_reg(hw, PHY_CTRL, phy_reg);
return 0; return 0;
break;
} }
return 8; return 8;
...@@ -1344,7 +1342,6 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter) ...@@ -1344,7 +1342,6 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
case e1000_82545_rev_3: case e1000_82545_rev_3:
case e1000_82546_rev_3: case e1000_82546_rev_3:
return e1000_set_phy_loopback(adapter); return e1000_set_phy_loopback(adapter);
break;
default: default:
rctl = er32(RCTL); rctl = er32(RCTL);
rctl |= E1000_RCTL_LBM_TCVR; rctl |= E1000_RCTL_LBM_TCVR;
......
...@@ -902,7 +902,6 @@ static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw) ...@@ -902,7 +902,6 @@ static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw)
default: default:
e_dbg("Flow control param set incorrectly\n"); e_dbg("Flow control param set incorrectly\n");
return -E1000_ERR_CONFIG; return -E1000_ERR_CONFIG;
break;
} }
/* Since auto-negotiation is enabled, take the link out of reset (the /* 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,7 +5040,6 @@ static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
break; break;
default: default:
return -E1000_ERR_PHY; return -E1000_ERR_PHY;
break;
} }
} else if (hw->phy_type == e1000_phy_igp) { /* For IGP PHY */ } else if (hw->phy_type == e1000_phy_igp) { /* For IGP PHY */
u16 cur_agc_value; u16 cur_agc_value;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment