e1000e: convert short duration msleep() to usleep_range()

With durations less than 20ms, the jiffies or legacy timer backed msleep()
may sleep ~20ms which might not be what the caller expects.  Instead, it
is recommended to use the hrtimers backed usleep_range().  For more, see
Documentation/timers/timers-howto.txt.  Issues reported by checkpatch.

In addition, remove unnecessary sleep in e1000e_write_nvm_spi().

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

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c
index 96921de5df2e..30ef8fa4968c 100644
--- a/drivers/net/e1000e/lib.c
+++ b/drivers/net/e1000e/lib.c
@@ -868,7 +868,7 @@ static s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
          * milliseconds even if the other end is doing it in SW).
          */
         for (i = 0; i < FIBER_LINK_UP_LIMIT; i++) {
-                msleep(10);
+                usleep_range(10000, 20000);
                 status = er32(STATUS);
                 if (status & E1000_STATUS_LU)
                         break;
@@ -930,7 +930,7 @@ s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw)
 
         ew32(CTRL, ctrl);
         e1e_flush();
-        msleep(1);
+        usleep_range(1000, 2000);
 
         /*
          * For these adapters, the SW definable pin 1 is set when the optics
@@ -1385,7 +1385,7 @@ s32 e1000e_get_auto_rd_done(struct e1000_hw *hw)
         while (i < AUTO_READ_DONE_TIMEOUT) {
                 if (er32(EECD) & E1000_EECD_AUTO_RD)
                         break;
-                msleep(1);
+                usleep_range(1000, 2000);
                 i++;
         }
 
@@ -2087,8 +2087,6 @@ s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
         if (ret_val)
                 return ret_val;
 
-        msleep(10);
-
         while (widx < words) {
                 u8 write_opcode = NVM_WRITE_OPCODE_SPI;
 
@@ -2132,7 +2130,7 @@ s32 e1000e_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
                 }
         }
 
-        msleep(10);
+        usleep_range(10000, 20000);
         nvm->ops.release(hw);
         return 0;
 }