summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000/e1000_hw.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/e1000/e1000_hw.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/e1000/e1000_hw.c')
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_hw.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.c b/drivers/net/ethernet/intel/e1000/e1000_hw.c
index e9b07ccc0eb..1acf5034db1 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_hw.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_hw.c
@@ -902,7 +902,6 @@ static s32 e1000_setup_fiber_serdes_link(struct e1000_hw *hw)
default:
e_dbg("Flow control param set incorrectly\n");
return -E1000_ERR_CONFIG;
- break;
}
/* 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,
break;
default:
return -E1000_ERR_PHY;
- break;
}
} else if (hw->phy_type == e1000_phy_igp) { /* For IGP PHY */
u16 cur_agc_value;