]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e1000: remove unnecessary code
authorGreg Dietsche <Gregory.Dietsche@cuw.edu>
Thu, 16 Jun 2011 07:09:30 +0000 (07:09 +0000)
committerJoe Jin <joe.jin@oracle.com>
Fri, 3 Feb 2012 01:16:01 +0000 (09:16 +0800)
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>
(cherry picked from commit c4dc4d108ace27cc0c594b67bd6bd945deaac8c2)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/e1000/e1000_hw.c

index f5831f0bf3ca45e17665f1a5096b03469d7b0c28..a5a89ecb6f3654c730d834a99f090248a6053b21 100644 (file)
@@ -3081,7 +3081,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");
 
@@ -3127,11 +3126,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);
 }
 
 /**