e1000: remove unnecessary code
authorGreg Dietsche <Gregory.Dietsche@cuw.edu>
Thu, 16 Jun 2011 07:09:30 +0000 (07:09 +0000)
committerDavid S. Miller <davem@conan.davemloft.net>
Fri, 17 Jun 2011 04:03:04 +0000 (00:03 -0400)
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>
drivers/net/e1000/e1000_hw.c

index 7501d977d992ae142f5b7b078be2d1bebce9c247..1698622af434495d08fb07888e26bad4d6d41064 100644 (file)
@@ -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);
 }
 
 /**