aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-07-20 10:25:20 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-21 00:30:18 -0400
commit4145ce0f59691820ea7e2c2be5d1c34aab61560e (patch)
tree0b9d194e2d73a79301de5c2168bdebe68f54b324
parentbc80d0d5186e75de0397b0c818b2a5d507dfd413 (diff)
e1000e: 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/e1000e/82571.c4
-rw-r--r--drivers/net/ethernet/intel/e1000e/ethtool.c2
-rw-r--r--drivers/net/ethernet/intel/e1000e/ich8lan.c1
-rw-r--r--drivers/net/ethernet/intel/e1000e/mac.c1
4 files changed, 0 insertions, 8 deletions
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)
95 break; 95 break;
96 default: 96 default:
97 return -E1000_ERR_PHY; 97 return -E1000_ERR_PHY;
98 break;
99 } 98 }
100 99
101 /* This can only be done after all function pointers are setup. */ 100 /* 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)
422 break; 421 break;
423 case e1000_82573: 422 case e1000_82573:
424 return e1000e_get_phy_id(hw); 423 return e1000e_get_phy_id(hw);
425 break;
426 case e1000_82574: 424 case e1000_82574:
427 case e1000_82583: 425 case e1000_82583:
428 ret_val = e1e_rphy(hw, MII_PHYSID1, &phy_id); 426 ret_val = e1e_rphy(hw, MII_PHYSID1, &phy_id);
@@ -440,7 +438,6 @@ static s32 e1000_get_phy_id_82571(struct e1000_hw *hw)
440 break; 438 break;
441 default: 439 default:
442 return -E1000_ERR_PHY; 440 return -E1000_ERR_PHY;
443 break;
444 } 441 }
445 442
446 return 0; 443 return 0;
@@ -1458,7 +1455,6 @@ static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)
1458 break; 1455 break;
1459 default: 1456 default:
1460 return -E1000_ERR_PHY; 1457 return -E1000_ERR_PHY;
1461 break;
1462 } 1458 }
1463 1459
1464 if (ret_val) 1460 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)
1521 switch (hw->mac.type) { 1521 switch (hw->mac.type) {
1522 case e1000_80003es2lan: 1522 case e1000_80003es2lan:
1523 return e1000_set_es2lan_mac_loopback(adapter); 1523 return e1000_set_es2lan_mac_loopback(adapter);
1524 break;
1525 case e1000_82571: 1524 case e1000_82571:
1526 case e1000_82572: 1525 case e1000_82572:
1527 return e1000_set_82571_fiber_loopback(adapter); 1526 return e1000_set_82571_fiber_loopback(adapter);
1528 break;
1529 default: 1527 default:
1530 rctl = er32(RCTL); 1528 rctl = er32(RCTL);
1531 rctl |= E1000_RCTL_LBM_TCVR; 1529 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)
572 break; 572 break;
573 default: 573 default:
574 return -E1000_ERR_PHY; 574 return -E1000_ERR_PHY;
575 break;
576 } 575 }
577 576
578 return 0; 577 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)
787 default: 787 default:
788 e_dbg("Flow control param set incorrectly\n"); 788 e_dbg("Flow control param set incorrectly\n");
789 return -E1000_ERR_CONFIG; 789 return -E1000_ERR_CONFIG;
790 break;
791 } 790 }
792 791
793 ew32(TXCW, txcw); 792 ew32(TXCW, txcw);