aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
authorDon Skidmore <donald.c.skidmore@intel.com>2011-03-18 05:32:53 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-04-13 22:23:11 -0400
commit032b4325b61b03f87f0346d0e92e39f785e24105 (patch)
tree10d20725cd30ad4c5daed140c779307f9f393f3f /drivers/net/ixgbe/ixgbe_main.c
parent0fa6d83258252695203d24c8818092644df10fd7 (diff)
ixgbe: cleanup short msleep's (<20ms) to use usleep_range
Since msleep might not sleep for the desired amount when less than 20ms use usleep_range. Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com> Tested-by: Stephen Ko <stephen.s.ko@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 3148e2182e9..5cd2cd3dd35 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2731,7 +2731,7 @@ void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter,
2731 2731
2732 /* poll to verify queue is enabled */ 2732 /* poll to verify queue is enabled */
2733 do { 2733 do {
2734 msleep(1); 2734 usleep_range(1000, 2000);
2735 txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(reg_idx)); 2735 txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(reg_idx));
2736 } while (--wait_loop && !(txdctl & IXGBE_TXDCTL_ENABLE)); 2736 } while (--wait_loop && !(txdctl & IXGBE_TXDCTL_ENABLE));
2737 if (!wait_loop) 2737 if (!wait_loop)
@@ -3023,7 +3023,7 @@ static void ixgbe_rx_desc_queue_enable(struct ixgbe_adapter *adapter,
3023 return; 3023 return;
3024 3024
3025 do { 3025 do {
3026 msleep(1); 3026 usleep_range(1000, 2000);
3027 rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(reg_idx)); 3027 rxdctl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(reg_idx));
3028 } while (--wait_loop && !(rxdctl & IXGBE_RXDCTL_ENABLE)); 3028 } while (--wait_loop && !(rxdctl & IXGBE_RXDCTL_ENABLE));
3029 3029
@@ -3945,7 +3945,7 @@ void ixgbe_reinit_locked(struct ixgbe_adapter *adapter)
3945{ 3945{
3946 WARN_ON(in_interrupt()); 3946 WARN_ON(in_interrupt());
3947 while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state)) 3947 while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
3948 msleep(1); 3948 usleep_range(1000, 2000);
3949 ixgbe_down(adapter); 3949 ixgbe_down(adapter);
3950 /* 3950 /*
3951 * If SR-IOV enabled then wait a bit before bringing the adapter 3951 * If SR-IOV enabled then wait a bit before bringing the adapter
@@ -4150,7 +4150,7 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
4150 /* this call also flushes the previous write */ 4150 /* this call also flushes the previous write */
4151 ixgbe_disable_rx_queue(adapter, adapter->rx_ring[i]); 4151 ixgbe_disable_rx_queue(adapter, adapter->rx_ring[i]);
4152 4152
4153 msleep(10); 4153 usleep_range(10000, 20000);
4154 4154
4155 netif_tx_stop_all_queues(netdev); 4155 netif_tx_stop_all_queues(netdev);
4156 4156