diff options
author | Florian Fainelli <florian.fainelli@telecomint.eu> | 2008-09-03 10:50:03 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 18:54:43 -0400 |
commit | c1d69937ee5818bcde3bed8c012c9f07d60e492e (patch) | |
tree | 534899fc1f7079509103269589592c650898bea1 /drivers/net/r6040.c | |
parent | 31b760202a0911384fa07796df9d1905e9e89a7f (diff) |
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 <tbm@cyrius.com>
Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/r6040.c')
-rw-r--r-- | drivers/net/r6040.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 5d86281d9363..025f526558bc 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) | |||
370 | /* Reset internal state machine */ | 370 | /* Reset internal state machine */ |
371 | iowrite16(2, ioaddr + MAC_SM); | 371 | iowrite16(2, ioaddr + MAC_SM); |
372 | iowrite16(0, ioaddr + MAC_SM); | 372 | iowrite16(0, ioaddr + MAC_SM); |
373 | udelay(5000); | 373 | mdelay(5); |
374 | 374 | ||
375 | /* MAC Bus Control Register */ | 375 | /* MAC Bus Control Register */ |
376 | iowrite16(MBCR_DEFAULT, ioaddr + MBCR); | 376 | iowrite16(MBCR_DEFAULT, ioaddr + MBCR); |
@@ -806,7 +806,7 @@ static void r6040_mac_address(struct net_device *dev) | |||
806 | iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */ | 806 | iowrite16(0x01, ioaddr + MCR1); /* Reset MAC */ |
807 | iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ | 807 | iowrite16(2, ioaddr + MAC_SM); /* Reset internal state machine */ |
808 | iowrite16(0, ioaddr + MAC_SM); | 808 | iowrite16(0, ioaddr + MAC_SM); |
809 | udelay(5000); | 809 | mdelay(5); |
810 | 810 | ||
811 | /* Restore MAC Address */ | 811 | /* Restore MAC Address */ |
812 | adrp = (u16 *) dev->dev_addr; | 812 | adrp = (u16 *) dev->dev_addr; |