Commit 0926d499 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: correct usleep_range usage 



Change the incorrect usage of `usleep_range(1000, 1000)' into
`usleep_range(1000, 2000)'.

Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 924d75ab

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -1224,7 +1224,7 @@ static inline int bnx2x_clean_tx_queue(struct bnx2x *bp, 
#endif

#endif

		}

		}

		cnt--;

		cnt--;

		usleep_range(1000, 1000);

		usleep_range(1000, 2000);

	}

	}





	return 0;

	return 0;
@@ -1259,7 +1259,7 @@ static inline bool bnx2x_wait_sp_comp(struct bnx2x *bp, unsigned long mask) 
		}

		}

		netif_addr_unlock_bh(bp->dev);

		netif_addr_unlock_bh(bp->dev);





		usleep_range(1000, 1000);

		usleep_range(1000, 2000);

	}

	}





	smp_mb();

	smp_mb();

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -8654,7 +8654,7 @@ void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode, bool keep_link) 
	}

	}





	/* Give HW time to discard old tx messages */

	/* Give HW time to discard old tx messages */

	usleep_range(1000, 1000);

	usleep_range(1000, 2000);





	/* Clean all ETH MACs */

	/* Clean all ETH MACs */

	rc = bnx2x_del_all_macs(bp, &bp->sp_objs[0].mac_obj, BNX2X_ETH_MAC,

	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) 
		if (pend_bits == 0)

		if (pend_bits == 0)

			break;

			break;





		usleep_range(1000, 1000);

		usleep_range(1000, 2000);

	} while (cnt-- > 0);

	} while (cnt-- > 0);





	if (cnt <= 0) {

	if (cnt <= 0) {
@@ -9113,7 +9113,7 @@ static int bnx2x_process_kill(struct bnx2x *bp, bool global) 
		    (pgl_exp_rom2 == 0xffffffff) &&

		    (pgl_exp_rom2 == 0xffffffff) &&

		    (!CHIP_IS_E3(bp) || (tags_63_32 == 0xffffffff)))

		    (!CHIP_IS_E3(bp) || (tags_63_32 == 0xffffffff)))

			break;

			break;

		usleep_range(1000, 1000);

		usleep_range(1000, 2000);

	} while (cnt-- > 0);

	} while (cnt-- > 0);





	if (cnt <= 0) {

	if (cnt <= 0) {
@@ -9146,7 +9146,7 @@ static int bnx2x_process_kill(struct bnx2x *bp, bool global) 
	/* Wait for 1ms to empty GLUE and PCI-E core queues,

	/* Wait for 1ms to empty GLUE and PCI-E core queues,

	 * PSWHST, GRC and PSWRD Tetris buffer.

	 * PSWHST, GRC and PSWRD Tetris buffer.

	 */

	 */

	usleep_range(1000, 1000);

	usleep_range(1000, 2000);





	/* Prepare to chip reset: */

	/* Prepare to chip reset: */

	/* MCP */

	/* MCP */
@@ -10917,7 +10917,7 @@ static int bnx2x_get_hwinfo(struct bnx2x *bp) 




			while (tout && REG_RD(bp, IGU_REG_RESET_MEMORIES)) {

			while (tout && REG_RD(bp, IGU_REG_RESET_MEMORIES)) {

				tout--;

				tout--;

				usleep_range(1000, 1000);

				usleep_range(1000, 2000);

			}

			}





			if (REG_RD(bp, IGU_REG_RESET_MEMORIES)) {

			if (REG_RD(bp, IGU_REG_RESET_MEMORIES)) {

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -325,7 +325,7 @@ static inline int bnx2x_state_wait(struct bnx2x *bp, int state, 
			return 0;

			return 0;

		}

		}





		usleep_range(1000, 1000);

		usleep_range(1000, 2000);





		if (bp->panic)

		if (bp->panic)

			return -EIO;

			return -EIO;
@@ -1407,7 +1407,7 @@ static int bnx2x_wait_vlan_mac(struct bnx2x *bp, 




		/* Wait until there are no pending commands */

		/* Wait until there are no pending commands */

		if (!bnx2x_exe_queue_empty(exeq))

		if (!bnx2x_exe_queue_empty(exeq))

			usleep_range(1000, 1000);

			usleep_range(1000, 2000);

		else

		else

			return 0;

			return 0;

	}

	}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -212,7 +212,7 @@ static int bnx2x_stats_comp(struct bnx2x *bp) 
			break;

			break;

		}

		}

		cnt--;

		cnt--;

		usleep_range(1000, 1000);

		usleep_range(1000, 2000);

	}

	}

	return 1;

	return 1;

}

}