Commit a16dda0e authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[BNX2]: Remove udelay() in copper PHY code. 



Change a long udelay() in bnx2_setup_copper_phy() to msleep().

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8dd064e

drivers/net/bnx2.c

+6 −7
Original line number Diff line number Diff line
@@ -1159,7 +1159,6 @@ bnx2_setup_copper_phy(struct bnx2 *bp) 
	}

	if (new_bmcr != bmcr) {

		u32 bmsr;

		int i = 0;



		bnx2_read_phy(bp, MII_BMSR, &bmsr);

		bnx2_read_phy(bp, MII_BMSR, &bmsr);
@@ -1167,12 +1166,12 @@ bnx2_setup_copper_phy(struct bnx2 *bp) 
		if (bmsr & BMSR_LSTATUS) {

			/* Force link down */

			bnx2_write_phy(bp, MII_BMCR, BMCR_LOOPBACK);

			do {

				udelay(100);

			spin_unlock_bh(&bp->phy_lock);

			msleep(50);

			spin_lock_bh(&bp->phy_lock);



			bnx2_read_phy(bp, MII_BMSR, &bmsr);

			bnx2_read_phy(bp, MII_BMSR, &bmsr);

				i++;

			} while ((bmsr & BMSR_LSTATUS) && (i < 620));

		}



		bnx2_write_phy(bp, MII_BMCR, new_bmcr);