From: Matthew Vick Date: Tue, 16 Apr 2013 00:53:04 +0000 (+0000) Subject: igb: Remove dead code path X-Git-Tag: MMI-PSA29.97-13-9~14469^2~46^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6cb7674bf2bc05c6219e33115ec76b7b401cd082;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git igb: Remove dead code path The 82575 manual initialization scripts are not supported on 82580 and above. Rather than call the function to immediately return, clarify the code by removing this pointless function call. Signed-off-by: Matthew Vick Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c index 6cb0ca2869b9..d3d72e0dfe3e 100644 --- a/drivers/net/ethernet/intel/igb/e1000_82575.c +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c @@ -2052,10 +2052,6 @@ static s32 igb_reset_hw_82580(struct e1000_hw *hw) hw_dbg("Auto Read Done did not complete\n"); } - /* If EEPROM is not present, run manual init scripts */ - if ((rd32(E1000_EECD) & E1000_EECD_PRES) == 0) - igb_reset_init_script_82575(hw); - /* clear global device reset status bit */ wr32(E1000_STATUS, E1000_STAT_DEV_RST_SET);