Skip to content

Commit

Permalink
e1000: remove unnecessary code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Dietsche authored and David S. Miller committed Jun 17, 2011
1 parent 0a3f084 commit c4dc4d1
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/net/e1000/e1000_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down Expand Up @@ -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);
}

/**
Expand Down

0 comments on commit c4dc4d1

Please sign in to comment.