diff options
| author | Greg Dietsche <Gregory.Dietsche@cuw.edu> | 2011-06-16 07:09:30 +0000 |
|---|---|---|
| committer | David S. Miller <davem@conan.davemloft.net> | 2011-06-17 00:03:04 -0400 |
| commit | c4dc4d108ace27cc0c594b67bd6bd945deaac8c2 (patch) | |
| tree | a17dc7e27e6c188d476f51a4ef773c9dd7360fef /drivers/net/e1000 | |
| parent | 0a3f084179731f6755462aa7fec677f8e1f0580a (diff) | |
| download | talos-op-linux-c4dc4d108ace27cc0c594b67bd6bd945deaac8c2.tar.gz talos-op-linux-c4dc4d108ace27cc0c594b67bd6bd945deaac8c2.zip | |
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')
| -rw-r--r-- | drivers/net/e1000/e1000_hw.c | 7 |
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) { u32 ctrl, ctrl_ext; u32 led_ctrl; - s32 ret_val; e_dbg("e1000_phy_hw_reset"); @@ -3126,11 +3125,7 @@ s32 e1000_phy_hw_reset(struct e1000_hw *hw) } /* Wait for FW to finish PHY configuration. */ - ret_val = e1000_get_phy_cfg_done(hw); - if (ret_val != E1000_SUCCESS) - return ret_val; - - return ret_val; + return e1000_get_phy_cfg_done(hw); } /** |
