igbvf: cleanup msleep() and min/max() usage

Fixed a few cases of when we used msleep() when we should have been
using usleep_range().  Also updated the usage of min/max() to use
min_t/max_t().

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>

diff --git a/drivers/net/ethernet/intel/igbvf/ethtool.c b/drivers/net/ethernet/intel/igbvf/ethtool.c
index 91a1190990aeac395cbf03695611a220599c5c35..c6996feb1cb4e2559b2b3a260d95a6b0f980b449 100644 (file)
--- a/drivers/net/ethernet/intel/igbvf/ethtool.c
+++ b/drivers/net/ethernet/intel/igbvf/ethtool.c
@@ -224,12 +224,12 @@ static int igbvf_set_ringparam(struct net_device *netdev,
        if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
                return -EINVAL;
 
-       new_rx_count = max(ring->rx_pending, (u32)IGBVF_MIN_RXD);
-       new_rx_count = min(new_rx_count, (u32)IGBVF_MAX_RXD);
+       new_rx_count = max_t(u32, ring->rx_pending, IGBVF_MIN_RXD);
+       new_rx_count = min_t(u32, new_rx_count, IGBVF_MAX_RXD);
        new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE);
 
-       new_tx_count = max(ring->tx_pending, (u32)IGBVF_MIN_TXD);
-       new_tx_count = min(new_tx_count, (u32)IGBVF_MAX_TXD);
+       new_tx_count = max_t(u32, ring->tx_pending, IGBVF_MIN_TXD);
+       new_tx_count = min_t(u32, new_tx_count, IGBVF_MAX_TXD);
        new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE);
 
        if ((new_tx_count == adapter->tx_ring->count) &&
@@ -239,7 +239,7 @@ static int igbvf_set_ringparam(struct net_device *netdev,
        }
 
        while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state))
-               msleep(1);
+               usleep_range(1000, 2000);
 
        if (!netif_running(adapter->netdev)) {
                adapter->tx_ring->count = new_tx_count;

diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 55f1404f133e46fe34a588443f007d1b2ff7e2f7..c17ea4b8f84d07bcaafe8965e5ff821d4b7b5480 100644 (file)
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -1552,7 +1552,7 @@ void igbvf_reinit_locked(struct igbvf_adapter *adapter)
 {
        might_sleep();
        while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state))
-               msleep(1);
+               usleep_range(1000, 2000);
        igbvf_down(adapter);
        igbvf_up(adapter);
        clear_bit(__IGBVF_RESETTING, &adapter->state);