diff options
author | Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> | 2014-08-27 12:43:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-29 23:15:36 -0400 |
commit | c1b2037fc141cc838435e58a9e4efb0b92a696e4 (patch) | |
tree | 4953f2d1196a40dd48b367e0274629b88c448109 | |
parent | 40e2b8ed855357b3b285d6575cec228e9ce8ebd1 (diff) |
qlcnic: Use usleep_range() instead of msleep() for sleep less than 20ms
As per recommendation, msleep() may sleep longer than intended time for
values less than 20ms. So, use usleep_range() instead of msleep()
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c index 528c651138b4..840bf36b5e9d 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | |||
@@ -2701,7 +2701,7 @@ static int qlcnic_83xx_poll_flash_status_reg(struct qlcnic_adapter *adapter) | |||
2701 | QLC_83XX_FLASH_STATUS_READY) | 2701 | QLC_83XX_FLASH_STATUS_READY) |
2702 | break; | 2702 | break; |
2703 | 2703 | ||
2704 | msleep(QLC_83XX_FLASH_STATUS_REG_POLL_DELAY); | 2704 | usleep_range(1000, 1100); |
2705 | } while (--retries); | 2705 | } while (--retries); |
2706 | 2706 | ||
2707 | if (!retries) | 2707 | if (!retries) |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c index 851cb4a80d50..8102673cb37f 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | |||
@@ -341,7 +341,7 @@ qlcnic_pcie_sem_lock(struct qlcnic_adapter *adapter, int sem, u32 id_reg) | |||
341 | } | 341 | } |
342 | return -EIO; | 342 | return -EIO; |
343 | } | 343 | } |
344 | msleep(1); | 344 | usleep_range(1000, 1500); |
345 | } | 345 | } |
346 | 346 | ||
347 | if (id_reg) | 347 | if (id_reg) |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c index c4262c23ed7c..be41e4c77b65 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | |||
@@ -537,7 +537,7 @@ int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter) | |||
537 | QLCWR32(adapter, QLCNIC_CRB_PEG_NET_3 + 0xc, 0); | 537 | QLCWR32(adapter, QLCNIC_CRB_PEG_NET_3 + 0xc, 0); |
538 | QLCWR32(adapter, QLCNIC_CRB_PEG_NET_4 + 0x8, 0); | 538 | QLCWR32(adapter, QLCNIC_CRB_PEG_NET_4 + 0x8, 0); |
539 | QLCWR32(adapter, QLCNIC_CRB_PEG_NET_4 + 0xc, 0); | 539 | QLCWR32(adapter, QLCNIC_CRB_PEG_NET_4 + 0xc, 0); |
540 | msleep(1); | 540 | usleep_range(1000, 1500); |
541 | 541 | ||
542 | QLC_SHARED_REG_WR32(adapter, QLCNIC_PEG_HALT_STATUS1, 0); | 542 | QLC_SHARED_REG_WR32(adapter, QLCNIC_PEG_HALT_STATUS1, 0); |
543 | QLC_SHARED_REG_WR32(adapter, QLCNIC_PEG_HALT_STATUS2, 0); | 543 | QLC_SHARED_REG_WR32(adapter, QLCNIC_PEG_HALT_STATUS2, 0); |
@@ -1198,7 +1198,7 @@ qlcnic_load_firmware(struct qlcnic_adapter *adapter) | |||
1198 | flashaddr += 8; | 1198 | flashaddr += 8; |
1199 | } | 1199 | } |
1200 | } | 1200 | } |
1201 | msleep(1); | 1201 | usleep_range(1000, 1500); |
1202 | 1202 | ||
1203 | QLCWR32(adapter, QLCNIC_CRB_PEG_NET_0 + 0x18, 0x1020); | 1203 | QLCWR32(adapter, QLCNIC_CRB_PEG_NET_0 + 0x18, 0x1020); |
1204 | QLCWR32(adapter, QLCNIC_ROMUSB_GLB_SW_RESET, 0x80001e); | 1204 | QLCWR32(adapter, QLCNIC_ROMUSB_GLB_SW_RESET, 0x80001e); |
@@ -1295,7 +1295,7 @@ next: | |||
1295 | rc = qlcnic_validate_firmware(adapter); | 1295 | rc = qlcnic_validate_firmware(adapter); |
1296 | if (rc != 0) { | 1296 | if (rc != 0) { |
1297 | release_firmware(adapter->fw); | 1297 | release_firmware(adapter->fw); |
1298 | msleep(1); | 1298 | usleep_range(1000, 1500); |
1299 | goto next; | 1299 | goto next; |
1300 | } | 1300 | } |
1301 | } | 1301 | } |