diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-20 21:30:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-20 21:30:28 -0700 |
| commit | 1b31a1bf851b55ce3180b0e40998ee32a2cc61e0 (patch) | |
| tree | 3e1f9170e5c2be9e637f3aa9696fff0a15403790 /drivers/net/ethernet/intel/e1000/e1000_ethtool.c | |
| parent | fa4eff44a65c91c9ad09e5695ba171a107e5c327 (diff) | |
| parent | b684106a53c42f1cd089c09809d236036e2af5ad (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/e1000/e1000_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/drivers/net/ethernet/intel/e1000/e1000_ethtool.c index d50f78afb56..cca5bca44e7 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) case e1000_82547: case e1000_82547_rev_2: return e1000_integrated_phy_loopback(adapter); - break; default: /* Default PHY loopback work is to read the MII * control register and assert bit 14 (loopback mode). @@ -1325,7 +1324,6 @@ static int e1000_set_phy_loopback(struct e1000_adapter *adapter) phy_reg |= MII_CR_LOOPBACK; e1000_write_phy_reg(hw, PHY_CTRL, phy_reg); return 0; - break; } return 8; @@ -1344,7 +1342,6 @@ static int e1000_setup_loopback_test(struct e1000_adapter *adapter) case e1000_82545_rev_3: case e1000_82546_rev_3: return e1000_set_phy_loopback(adapter); - break; default: rctl = er32(RCTL); rctl |= E1000_RCTL_LBM_TCVR; |