diff options
| author |   Jesse Brandeburg <jesse.brandeburg@intel.com> | 2011-10-05 07:24:46 +0000 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-10-06 22:40:05 -0700 |
| commit | 4e0d8f7d97f9150bdd07f6355e5c1486967dce79 (patch) | |
| tree | eb298948681e21ada20a3ecdd6e06038584bf8db /drivers/net/ethernet/intel/e1000/e1000_main.c | |
| parent | e1000: convert hardware management from timers to threads (diff) | |
| download | linux-dev-4e0d8f7d97f9150bdd07f6355e5c1486967dce79.tar.xz linux-dev-4e0d8f7d97f9150bdd07f6355e5c1486967dce79.zip | |
e1000: convert mdelay to msleep
With the previous commit, there are several functions
that are only ever called from thread context, and are
able to sleep with msleep instead of mdelay.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Tushar Dave <tushar.n.dave@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index a0c5ea0d3fd5..6d03d7672699 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c @@ -485,7 +485,7 @@ static void e1000_power_down_phy(struct e1000_adapter *adapter) e1000_read_phy_reg(hw, PHY_CTRL, &mii_reg); mii_reg |= MII_CR_POWER_DOWN; e1000_write_phy_reg(hw, PHY_CTRL, mii_reg); - mdelay(1); + msleep(1); } out: return; |