summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-03-05 13:46:51 +0000
committerAnatolij Gustschin <agust@denx.de>2012-03-27 14:44:12 +0200
commit65029492914ea96dec0bfe25a987463a869c72d2 (patch)
tree068df3280a1ad9cfa958b27014f77a247b64a794 /drivers
parentc46bf09e0b567dda477da53163fe646e66c4912e (diff)
downloadblackbird-obmc-uboot-65029492914ea96dec0bfe25a987463a869c72d2.tar.gz
blackbird-obmc-uboot-65029492914ea96dec0bfe25a987463a869c72d2.zip
net: smc91111: use mdelay()
We've already got a mdelay() func in common code, so use that instead. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/smc91111.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 9b8236ddf0..5cfef4dd7b 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -1169,17 +1169,6 @@ static void smc_write_phy_register (struct eth_device *dev, byte phyreg,
/*------------------------------------------------------------
- . Waits the specified number of milliseconds - kernel friendly
- .-------------------------------------------------------------*/
-#ifndef CONFIG_SMC91111_EXT_PHY
-static void smc_wait_ms(unsigned int ms)
-{
- udelay(ms*1000);
-}
-#endif /* !CONFIG_SMC91111_EXT_PHY */
-
-
-/*------------------------------------------------------------
. Configures the specified PHY using Autonegotiation. Calls
. smc_phy_fixed() if the user has requested a certain config.
.-------------------------------------------------------------*/
@@ -1205,7 +1194,7 @@ static void smc_phy_configure (struct eth_device *dev)
break;
}
- smc_wait_ms (500); /* wait 500 millisecs */
+ mdelay(500); /* wait 500 millisecs */
}
if (timeout < 1) {
@@ -1270,7 +1259,7 @@ static void smc_phy_configure (struct eth_device *dev)
break;
}
- smc_wait_ms (500); /* wait 500 millisecs */
+ mdelay(500); /* wait 500 millisecs */
/* Restart auto-negotiation if remote fault */
if (status & PHY_STAT_REM_FLT) {
OpenPOWER on IntegriCloud