diff mbox

[U-Boot] net: smc91111: use mdelay()

Message ID 1330991211-9927-1-git-send-email-vapier@gentoo.org
State Accepted
Commit 65029492914ea96dec0bfe25a987463a869c72d2
Delegated to: Anatolij Gustschin
Headers show

Commit Message

Mike Frysinger March 5, 2012, 11:46 p.m. UTC 
We've already got a mdelay() func in common code, so use that instead.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 drivers/net/smc91111.c |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

Comments

Anatolij Gustschin March 27, 2012, 1:14 p.m. UTC | #1 
Hi Mike,

On Mon,  5 Mar 2012 18:46:51 -0500
Mike Frysinger <vapier@gentoo.org> wrote:

> We've already got a mdelay() func in common code, so use that instead.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  drivers/net/smc91111.c |   15 ++-------------
>  1 files changed, 2 insertions(+), 13 deletions(-)

Applied to u-boot-staging/agust@denx.de, thanks!

Anatolij
diff mbox

Patch

diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 9b8236d..5cfef4d 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) {