aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/ich8lan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000e/ich8lan.c')
-rw-r--r--drivers/net/e1000e/ich8lan.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index ce1dbfdca112..06ff884bc2c7 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -338,7 +338,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
338 /* Ungate automatic PHY configuration on non-managed 82579 */ 338 /* Ungate automatic PHY configuration on non-managed 82579 */
339 if ((hw->mac.type == e1000_pch2lan) && 339 if ((hw->mac.type == e1000_pch2lan) &&
340 !(fwsm & E1000_ICH_FWSM_FW_VALID)) { 340 !(fwsm & E1000_ICH_FWSM_FW_VALID)) {
341 msleep(10); 341 usleep_range(10000, 20000);
342 e1000_gate_hw_phy_config_ich8lan(hw, false); 342 e1000_gate_hw_phy_config_ich8lan(hw, false);
343 } 343 }
344 344
@@ -427,7 +427,7 @@ static s32 e1000_init_phy_params_ich8lan(struct e1000_hw *hw)
427 phy->id = 0; 427 phy->id = 0;
428 while ((e1000_phy_unknown == e1000e_get_phy_type_from_id(phy->id)) && 428 while ((e1000_phy_unknown == e1000e_get_phy_type_from_id(phy->id)) &&
429 (i++ < 100)) { 429 (i++ < 100)) {
430 msleep(1); 430 usleep_range(1000, 2000);
431 ret_val = e1000e_get_phy_id(hw); 431 ret_val = e1000e_get_phy_id(hw);
432 if (ret_val) 432 if (ret_val)
433 return ret_val; 433 return ret_val;
@@ -1704,7 +1704,7 @@ static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw)
1704 goto out; 1704 goto out;
1705 1705
1706 /* Allow time for h/w to get to quiescent state after reset */ 1706 /* Allow time for h/w to get to quiescent state after reset */
1707 msleep(10); 1707 usleep_range(10000, 20000);
1708 1708
1709 /* Perform any necessary post-reset workarounds */ 1709 /* Perform any necessary post-reset workarounds */
1710 switch (hw->mac.type) { 1710 switch (hw->mac.type) {
@@ -1737,7 +1737,7 @@ static s32 e1000_post_phy_reset_ich8lan(struct e1000_hw *hw)
1737 if (hw->mac.type == e1000_pch2lan) { 1737 if (hw->mac.type == e1000_pch2lan) {
1738 /* Ungate automatic PHY configuration on non-managed 82579 */ 1738 /* Ungate automatic PHY configuration on non-managed 82579 */
1739 if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) { 1739 if (!(er32(FWSM) & E1000_ICH_FWSM_FW_VALID)) {
1740 msleep(10); 1740 usleep_range(10000, 20000);
1741 e1000_gate_hw_phy_config_ich8lan(hw, false); 1741 e1000_gate_hw_phy_config_ich8lan(hw, false);
1742 } 1742 }
1743 1743
@@ -2532,7 +2532,7 @@ release:
2532 */ 2532 */
2533 if (!ret_val) { 2533 if (!ret_val) {
2534 e1000e_reload_nvm(hw); 2534 e1000e_reload_nvm(hw);
2535 msleep(10); 2535 usleep_range(10000, 20000);
2536 } 2536 }
2537 2537
2538out: 2538out:
@@ -3009,7 +3009,7 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
3009 ew32(TCTL, E1000_TCTL_PSP); 3009 ew32(TCTL, E1000_TCTL_PSP);
3010 e1e_flush(); 3010 e1e_flush();
3011 3011
3012 msleep(10); 3012 usleep_range(10000, 20000);
3013 3013
3014 /* Workaround for ICH8 bit corruption issue in FIFO memory */ 3014 /* Workaround for ICH8 bit corruption issue in FIFO memory */
3015 if (hw->mac.type == e1000_ich8lan) { 3015 if (hw->mac.type == e1000_ich8lan) {