aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel
diff options
context:
space:
mode:
authorMark Rustad <mark.d.rustad@intel.com>2014-07-22 02:50:36 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-07-25 21:45:15 -0400
commitd819fc52117e18e9e331edc8fe7bd623279825d0 (patch)
tree6327601586f48cb961999ca2e20026c69635d44d /drivers/net/ethernet/intel
parentac3d2e5a9ef2f4d8f57c50070c4883ecb7cec29f (diff)
ixgbe: Convert some udelays to usleep_range
Convert some udelay calls to the preferred usleep_range. Signed-off-by: Mark Rustad <mark.d.rustad@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@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/ixgbe/ixgbe_common.c6
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
index 3f318c52e053..db759f98f9f0 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
@@ -1386,7 +1386,7 @@ static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw)
1386 status = 0; 1386 status = 0;
1387 break; 1387 break;
1388 } 1388 }
1389 udelay(50); 1389 usleep_range(50, 100);
1390 } 1390 }
1391 1391
1392 if (i == timeout) { 1392 if (i == timeout) {
@@ -1399,7 +1399,7 @@ static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw)
1399 */ 1399 */
1400 ixgbe_release_eeprom_semaphore(hw); 1400 ixgbe_release_eeprom_semaphore(hw);
1401 1401
1402 udelay(50); 1402 usleep_range(50, 100);
1403 /* 1403 /*
1404 * one last try 1404 * one last try
1405 * If the SMBI bit is 0 when we read it, then the bit will be 1405 * If the SMBI bit is 0 when we read it, then the bit will be
@@ -1427,7 +1427,7 @@ static s32 ixgbe_get_eeprom_semaphore(struct ixgbe_hw *hw)
1427 if (swsm & IXGBE_SWSM_SWESMBI) 1427 if (swsm & IXGBE_SWSM_SWESMBI)
1428 break; 1428 break;
1429 1429
1430 udelay(50); 1430 usleep_range(50, 100);
1431 } 1431 }
1432 1432
1433 /* 1433 /*
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
index 40dd798e1290..942ad13c684a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
@@ -699,7 +699,7 @@ static s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw)
699 status = 0; 699 status = 0;
700 break; 700 break;
701 } 701 }
702 udelay(50); 702 usleep_range(50, 100);
703 } 703 }
704 704
705 /* Now get the semaphore between SW/FW through the REGSMP bit */ 705 /* Now get the semaphore between SW/FW through the REGSMP bit */
@@ -709,7 +709,7 @@ static s32 ixgbe_get_swfw_sync_semaphore(struct ixgbe_hw *hw)
709 if (!(swsm & IXGBE_SWFW_REGSMP)) 709 if (!(swsm & IXGBE_SWFW_REGSMP))
710 break; 710 break;
711 711
712 udelay(50); 712 usleep_range(50, 100);
713 } 713 }
714 } else { 714 } else {
715 hw_dbg(hw, "Software semaphore SMBI between device drivers not granted.\n"); 715 hw_dbg(hw, "Software semaphore SMBI between device drivers not granted.\n");