openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

e1000e: remove unnecessary break after return 

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Fabian Frederick 2014-07-20 16:25:20 +02:00 committed by David S. Miller
parent bc80d0d518
commit 4145ce0f59
4 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/intel/e1000e/82571.c
View File

@ -95,7 +95,6 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw)
break; break;
default: default:
return -E1000_ERR_PHY; return -E1000_ERR_PHY;
break;
} }
/* This can only be done after all function pointers are setup. */ /* 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; break;
case e1000_82573: case e1000_82573:
return e1000e_get_phy_id(hw); return e1000e_get_phy_id(hw);
break;
case e1000_82574: case e1000_82574:
case e1000_82583: case e1000_82583:
ret_val = e1e_rphy(hw, MII_PHYSID1, &phy_id); 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; break;
default: default:
return -E1000_ERR_PHY; return -E1000_ERR_PHY;
break;
} }
return 0; return 0;
@ -1458,7 +1455,6 @@ static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)
break; break;
default: default:
return -E1000_ERR_PHY; return -E1000_ERR_PHY;
break;
} }
if (ret_val) if (ret_val)

2
drivers/net/ethernet/intel/e1000e/ethtool.c
View File

@ -1521,11 +1521,9 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter)
switch (hw->mac.type) { switch (hw->mac.type) {
case e1000_80003es2lan: case e1000_80003es2lan:
return e1000_set_es2lan_mac_loopback(adapter); return e1000_set_es2lan_mac_loopback(adapter);
break;
case e1000_82571: case e1000_82571:
case e1000_82572: case e1000_82572:
return e1000_set_82571_fiber_loopback(adapter); return e1000_set_82571_fiber_loopback(adapter);
break;
default: default:
rctl = er32(RCTL); rctl = er32(RCTL);
rctl |= E1000_RCTL_LBM_TCVR; rctl |= E1000_RCTL_LBM_TCVR;

1
drivers/net/ethernet/intel/e1000e/ich8lan.c
View File

@ -572,7 +572,6 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw)
break; break;
default: default:
return -E1000_ERR_PHY; return -E1000_ERR_PHY;
break;
} }
return 0; return 0;

1
drivers/net/ethernet/intel/e1000e/mac.c
View File

@ -787,7 +787,6 @@ static s32 e1000_commit_fc_settings_generic(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;
} }
ew32(TXCW, txcw); ew32(TXCW, txcw);