From: Florian Fainelli Date: Wed, 3 Sep 2008 14:50:03 +0000 (+0200) Subject: r6040: fix bad usage of udelay X-Git-Tag: v2.6.28-rc1~717^2~195^2~42 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=c1d69937ee5818bcde3bed8c012c9f07d60e492e;p=safe%2Fjmp%2Flinux-2.6 r6040: fix bad usage of udelay This patch fixes the bad usage of udelay(5000), which in turns is a mdelay(5). It causes compilation for ARM where udelay maximum value is checked. Reported-by: Martin Michlmayr Signed-off-by: Florian Fainelli Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 5d86281..025f526 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -370,7 +370,7 @@ static void r6040_init_mac_regs(struct net_device *dev) /* Reset internal state machine */ iowrite16(2, ioaddr + MAC_SM); iowrite16(0, ioaddr + MAC_SM); - udelay(5000); + mdelay(5); /* MAC Bus Control Register */ iowrite16(MBCR_DEFAULT, ioaddr + MBCR); @@ -806,7 +806,7 @@ static void r6040_mac_address(struct net_device *dev) iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */ iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ iowrite16(0, ioaddr + MAC_SM); - udelay(5000); + mdelay(5); /* Restore MAC Address */ adrp = (u16 *) dev->dev_addr;