igb: Remove dead code path
authorMatthew Vick <matthew.vick@intel.com>
Tue, 16 Apr 2013 00:53:04 +0000 (00:53 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 25 Apr 2013 03:36:02 +0000 (20:36 -0700)
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 <matthew.vick@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/igb/e1000_82575.c

index 6cb0ca2869b981fae5f818eeb0a4d7a20b82913e..d3d72e0dfe3e81fa470e2a1ea0f6a663ef8e5dfd 100644 (file)
@@ -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);