diff options
author | Yuval Mintz <yuvalmin@broadcom.com> | 2013-01-22 22:21:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-23 13:58:28 -0500 |
commit | 0926d499e24d22da77f83cbfb3b22e1ad89aa7db (patch) | |
tree | 12acd767f819a2f14ff932b18add5c4ba64c7248 /drivers | |
parent | 924d75ab3da25c3498b329158f7226fb80cd8cec (diff) |
bnx2x: correct usleep_range usage
Change the incorrect usage of `usleep_range(1000, 1000)' into
`usleep_range(1000, 2000)'.
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 10 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index 3e4f3fa6acdb..9b6e27acb54c 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | |||
@@ -1224,7 +1224,7 @@ static inline int bnx2x_clean_tx_queue(struct bnx2x *bp, | |||
1224 | #endif | 1224 | #endif |
1225 | } | 1225 | } |
1226 | cnt--; | 1226 | cnt--; |
1227 | usleep_range(1000, 1000); | 1227 | usleep_range(1000, 2000); |
1228 | } | 1228 | } |
1229 | 1229 | ||
1230 | return 0; | 1230 | return 0; |
@@ -1259,7 +1259,7 @@ static inline bool bnx2x_wait_sp_comp(struct bnx2x *bp, unsigned long mask) | |||
1259 | } | 1259 | } |
1260 | netif_addr_unlock_bh(bp->dev); | 1260 | netif_addr_unlock_bh(bp->dev); |
1261 | 1261 | ||
1262 | usleep_range(1000, 1000); | 1262 | usleep_range(1000, 2000); |
1263 | } | 1263 | } |
1264 | 1264 | ||
1265 | smp_mb(); | 1265 | smp_mb(); |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index c8158ba6ebfc..e496f190032a 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
@@ -8654,7 +8654,7 @@ void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode, bool keep_link) | |||
8654 | } | 8654 | } |
8655 | 8655 | ||
8656 | /* Give HW time to discard old tx messages */ | 8656 | /* Give HW time to discard old tx messages */ |
8657 | usleep_range(1000, 1000); | 8657 | usleep_range(1000, 2000); |
8658 | 8658 | ||
8659 | /* Clean all ETH MACs */ | 8659 | /* Clean all ETH MACs */ |
8660 | rc = bnx2x_del_all_macs(bp, &bp->sp_objs[0].mac_obj, BNX2X_ETH_MAC, | 8660 | rc = bnx2x_del_all_macs(bp, &bp->sp_objs[0].mac_obj, BNX2X_ETH_MAC, |
@@ -9078,7 +9078,7 @@ static int bnx2x_er_poll_igu_vq(struct bnx2x *bp) | |||
9078 | if (pend_bits == 0) | 9078 | if (pend_bits == 0) |
9079 | break; | 9079 | break; |
9080 | 9080 | ||
9081 | usleep_range(1000, 1000); | 9081 | usleep_range(1000, 2000); |
9082 | } while (cnt-- > 0); | 9082 | } while (cnt-- > 0); |
9083 | 9083 | ||
9084 | if (cnt <= 0) { | 9084 | if (cnt <= 0) { |
@@ -9113,7 +9113,7 @@ static int bnx2x_process_kill(struct bnx2x *bp, bool global) | |||
9113 | (pgl_exp_rom2 == 0xffffffff) && | 9113 | (pgl_exp_rom2 == 0xffffffff) && |
9114 | (!CHIP_IS_E3(bp) || (tags_63_32 == 0xffffffff))) | 9114 | (!CHIP_IS_E3(bp) || (tags_63_32 == 0xffffffff))) |
9115 | break; | 9115 | break; |
9116 | usleep_range(1000, 1000); | 9116 | usleep_range(1000, 2000); |
9117 | } while (cnt-- > 0); | 9117 | } while (cnt-- > 0); |
9118 | 9118 | ||
9119 | if (cnt <= 0) { | 9119 | if (cnt <= 0) { |
@@ -9146,7 +9146,7 @@ static int bnx2x_process_kill(struct bnx2x *bp, bool global) | |||
9146 | /* Wait for 1ms to empty GLUE and PCI-E core queues, | 9146 | /* Wait for 1ms to empty GLUE and PCI-E core queues, |
9147 | * PSWHST, GRC and PSWRD Tetris buffer. | 9147 | * PSWHST, GRC and PSWRD Tetris buffer. |
9148 | */ | 9148 | */ |
9149 | usleep_range(1000, 1000); | 9149 | usleep_range(1000, 2000); |
9150 | 9150 | ||
9151 | /* Prepare to chip reset: */ | 9151 | /* Prepare to chip reset: */ |
9152 | /* MCP */ | 9152 | /* MCP */ |
@@ -10917,7 +10917,7 @@ static int bnx2x_get_hwinfo(struct bnx2x *bp) | |||
10917 | 10917 | ||
10918 | while (tout && REG_RD(bp, IGU_REG_RESET_MEMORIES)) { | 10918 | while (tout && REG_RD(bp, IGU_REG_RESET_MEMORIES)) { |
10919 | tout--; | 10919 | tout--; |
10920 | usleep_range(1000, 1000); | 10920 | usleep_range(1000, 2000); |
10921 | } | 10921 | } |
10922 | 10922 | ||
10923 | if (REG_RD(bp, IGU_REG_RESET_MEMORIES)) { | 10923 | if (REG_RD(bp, IGU_REG_RESET_MEMORIES)) { |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c index c0e0359d218d..4a28601908bc 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | |||
@@ -325,7 +325,7 @@ static inline int bnx2x_state_wait(struct bnx2x *bp, int state, | |||
325 | return 0; | 325 | return 0; |
326 | } | 326 | } |
327 | 327 | ||
328 | usleep_range(1000, 1000); | 328 | usleep_range(1000, 2000); |
329 | 329 | ||
330 | if (bp->panic) | 330 | if (bp->panic) |
331 | return -EIO; | 331 | return -EIO; |
@@ -1407,7 +1407,7 @@ static int bnx2x_wait_vlan_mac(struct bnx2x *bp, | |||
1407 | 1407 | ||
1408 | /* Wait until there are no pending commands */ | 1408 | /* Wait until there are no pending commands */ |
1409 | if (!bnx2x_exe_queue_empty(exeq)) | 1409 | if (!bnx2x_exe_queue_empty(exeq)) |
1410 | usleep_range(1000, 1000); | 1410 | usleep_range(1000, 2000); |
1411 | else | 1411 | else |
1412 | return 0; | 1412 | return 0; |
1413 | } | 1413 | } |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c index 18c2e61498de..1069669f241d 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | |||
@@ -212,7 +212,7 @@ static int bnx2x_stats_comp(struct bnx2x *bp) | |||
212 | break; | 212 | break; |
213 | } | 213 | } |
214 | cnt--; | 214 | cnt--; |
215 | usleep_range(1000, 1000); | 215 | usleep_range(1000, 2000); |
216 | } | 216 | } |
217 | return 1; | 217 | return 1; |
218 | } | 218 | } |