aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_hw.c
diff options
context:
space:
mode:
authorGreg Dietsche <Gregory.Dietsche@cuw.edu>2011-06-16 03:09:30 -0400
committerDavid S. Miller <davem@conan.davemloft.net>2011-06-17 00:03:04 -0400
commitc4dc4d108ace27cc0c594b67bd6bd945deaac8c2 (patch)
treea17dc7e27e6c188d476f51a4ef773c9dd7360fef /drivers/net/e1000/e1000_hw.c
parent0a3f084179731f6755462aa7fec677f8e1f0580a (diff)
e1000: remove unnecessary code
Compile tested. remove unnecessary code that matches this coccinelle pattern if (...) return ret; return ret; Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: David S. Miller <davem@conan.davemloft.net>
Diffstat (limited to 'drivers/net/e1000/e1000_hw.c')
-rw-r--r--drivers/net/e1000/e1000_hw.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 7501d977d992..1698622af434 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -3080,7 +3080,6 @@ s32 e1000_phy_hw_reset(struct e1000_hw *hw)
3080{ 3080{
3081 u32 ctrl, ctrl_ext; 3081 u32 ctrl, ctrl_ext;
3082 u32 led_ctrl; 3082 u32 led_ctrl;
3083 s32 ret_val;
3084 3083
3085 e_dbg("e1000_phy_hw_reset"); 3084 e_dbg("e1000_phy_hw_reset");
3086 3085
@@ -3126,11 +3125,7 @@ s32 e1000_phy_hw_reset(struct e1000_hw *hw)
3126 } 3125 }
3127 3126
3128 /* Wait for FW to finish PHY configuration. */ 3127 /* Wait for FW to finish PHY configuration. */
3129 ret_val = e1000_get_phy_cfg_done(hw); 3128 return e1000_get_phy_cfg_done(hw);
3130 if (ret_val != E1000_SUCCESS)
3131 return ret_val;
3132
3133 return ret_val;
3134} 3129}
3135 3130
3136/** 3131/**