aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel
diff options
context:
space:
mode:
authorMatthew Vick <matthew.vick@intel.com>2013-04-15 20:53:04 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-04-24 23:36:02 -0400
commit6cb7674bf2bc05c6219e33115ec76b7b401cd082 (patch)
treed145f12c753a7d8b5865427524f3426d0cbff1ac /drivers/net/ethernet/intel
parent6f3dc319ec5c101e1e927e55d593ad6637648fe5 (diff)
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 <matthew.vick@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r--drivers/net/ethernet/intel/igb/e1000_82575.c4
1 files changed, 0 insertions, 4 deletions
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)
2052 hw_dbg("Auto Read Done did not complete\n"); 2052 hw_dbg("Auto Read Done did not complete\n");
2053 } 2053 }
2054 2054
2055 /* If EEPROM is not present, run manual init scripts */
2056 if ((rd32(E1000_EECD) & E1000_EECD_PRES) == 0)
2057 igb_reset_init_script_82575(hw);
2058
2059 /* clear global device reset status bit */ 2055 /* clear global device reset status bit */
2060 wr32(E1000_STATUS, E1000_STAT_DEV_RST_SET); 2056 wr32(E1000_STATUS, E1000_STAT_DEV_RST_SET);
2061 2057