diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /drivers/net/ax88180.c | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'drivers/net/ax88180.c')
| -rw-r--r-- | drivers/net/ax88180.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c index 261fde00c15..28cb41272a9 100644 --- a/drivers/net/ax88180.c +++ b/drivers/net/ax88180.c @@ -39,8 +39,10 @@ */ #include <common.h> #include <command.h> +#include <log.h> #include <net.h> #include <malloc.h> +#include <linux/delay.h> #include <linux/mii.h> #include "ax88180.h" @@ -117,7 +119,7 @@ static int ax88180_phy_reset (struct eth_device *dev) /* Wait for the reset to complete, or time out (500 ms) */ while (ax88180_mdio_read (dev, MII_BMCR) & BMCR_RESET) { - udelay (1000); + udelay(1000); if (--delay_cnt == 0) { printf ("Failed to reset PHY!\n"); return -1; @@ -176,7 +178,7 @@ static int ax88180_poll_tx_complete (struct eth_device *dev) if ((tmpval & txbs_txdp) == 0) break; - udelay (100); + udelay(100); } if (TimeOutCnt) @@ -341,7 +343,7 @@ static void ax88180_media_config (struct eth_device *dev) if (bmsr_val & BMSR_LSTATUS) { break; } - udelay (100); + udelay(100); } bmsr_val = ax88180_mdio_read (dev, MII_BMSR); @@ -363,7 +365,7 @@ static void ax88180_media_config (struct eth_device *dev) if (bmsr_val & BMSR_ANEGCOMPLETE) { break; } - udelay (100); + udelay(100); } } else debug ("ax88180: Auto-negotiation is disabled.\n"); @@ -679,7 +681,7 @@ static void ax88180_read_mac_addr (struct eth_device *dev) tmp_regval = INW (dev, PROMCTRL); if ((tmp_regval & RELOAD_EEPROM) == 0) break; - udelay (1000); + udelay(1000); } /* Get MAC addresses */ |