summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/82571.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-07-20 21:30:28 -0700
committerDavid S. Miller <davem@davemloft.net>2014-07-20 21:30:28 -0700
commit1b31a1bf851b55ce3180b0e40998ee32a2cc61e0 (patch)
tree3e1f9170e5c2be9e637f3aa9696fff0a15403790 /drivers/net/ethernet/intel/e1000e/82571.c
parentfa4eff44a65c91c9ad09e5695ba171a107e5c327 (diff)
parentb684106a53c42f1cd089c09809d236036e2af5ad (diff)
Merge branch 'break_after_return'
Fabian Frederick says: ==================== drivers/net: remove unnecessary break after return Second patchset after "remove unnecessary break after goto" addressing break redundancy on drivers/net branch (suggested by Joe Perches) ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/82571.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/82571.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 218481e509f..dc79ed85030 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)
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)