From 07e1114671c8b13d1bb90548a3c5ea31c49415d1 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 10 May 2020 11:40:10 -0600 Subject: Fix some checkpatch warnings in calls to udelay() Fix up some incorrect code style in calls to functions in the linux/time.h header, mostly udelay(). Signed-off-by: Simon Glass --- drivers/net/ax88180.c | 10 +++++----- drivers/net/eepro100.c | 18 +++++++++--------- drivers/net/lan91c96.c | 10 +++++----- drivers/net/smc91111.c | 22 +++++++++++----------- 4 files changed, 30 insertions(+), 30 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c index d13eb11187..2715653cd4 100644 --- a/drivers/net/ax88180.c +++ b/drivers/net/ax88180.c @@ -118,7 +118,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; @@ -177,7 +177,7 @@ static int ax88180_poll_tx_complete (struct eth_device *dev) if ((tmpval & txbs_txdp) == 0) break; - udelay (100); + udelay(100); } if (TimeOutCnt) @@ -342,7 +342,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); @@ -364,7 +364,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"); @@ -680,7 +680,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 */ diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 2fe0ba6e20..36a9d4d91c 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -462,7 +462,7 @@ int eepro100_initialize (bd_t * bis) */ pci_write_config_byte (devno, PCI_LATENCY_TIMER, 0x20); - udelay (10 * 1000); + udelay(10 * 1000); read_hw_addr (dev, bis); } @@ -480,10 +480,10 @@ static int eepro100_init (struct eth_device *dev, bd_t * bis) /* Reset the ethernet controller */ OUTL (dev, I82559_SELECTIVE_RESET, SCBPort); - udelay (20); + udelay(20); OUTL (dev, I82559_RESET, SCBPort); - udelay (20); + udelay(20); if (!wait_for_eepro100 (dev)) { printf ("Error: Can not reset ethernet controller.\n"); @@ -721,10 +721,10 @@ static void eepro100_halt (struct eth_device *dev) /* Reset the ethernet controller */ OUTL (dev, I82559_SELECTIVE_RESET, SCBPort); - udelay (20); + udelay(20); OUTL (dev, I82559_RESET, SCBPort); - udelay (20); + udelay(20); if (!wait_for_eepro100 (dev)) { printf ("Error: Can not reset ethernet controller.\n"); @@ -760,19 +760,19 @@ static int read_eeprom (struct eth_device *dev, int location, int addr_len) short dataval = (read_cmd & (1 << i)) ? EE_DATA_WRITE : 0; OUTW (dev, EE_ENB | dataval, SCBeeprom); - udelay (1); + udelay(1); OUTW (dev, EE_ENB | dataval | EE_SHIFT_CLK, SCBeeprom); - udelay (1); + udelay(1); } OUTW (dev, EE_ENB, SCBeeprom); for (i = 15; i >= 0; i--) { OUTW (dev, EE_ENB | EE_SHIFT_CLK, SCBeeprom); - udelay (1); + udelay(1); retval = (retval << 1) | ((INW (dev, SCBeeprom) & EE_DATA_READ) ? 1 : 0); OUTW (dev, EE_ENB, SCBeeprom); - udelay (1); + udelay(1); } /* Terminate the EEPROM access. */ diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c index c08bd21f95..1989b66a48 100644 --- a/drivers/net/lan91c96.c +++ b/drivers/net/lan91c96.c @@ -211,7 +211,7 @@ static void smc_reset(struct eth_device *dev) SMC_SELECT_BANK(dev, 0); SMC_outw(dev, LAN91C96_RCR_SOFT_RST, LAN91C96_RCR); - udelay (10); + udelay(10); /* Disable transmit and receive functionality */ SMC_outw(dev, 0, LAN91C96_RCR); @@ -438,7 +438,7 @@ static int smc_send_packet(struct eth_device *dev, void *packet, /* wait for MMU getting ready (low) */ while (SMC_inw(dev, LAN91C96_MMU) & LAN91C96_MMUCR_NO_BUSY) - udelay (10); + udelay(10); PRINTK2("MMU ready\n"); @@ -455,7 +455,7 @@ static int smc_send_packet(struct eth_device *dev, void *packet, /* wait for MMU getting ready (low) */ while (SMC_inw(dev, LAN91C96_MMU) & LAN91C96_MMUCR_NO_BUSY) - udelay (10); + udelay(10); PRINTK2 ("MMU ready\n"); } @@ -600,13 +600,13 @@ static int smc_rcv(struct eth_device *dev) } while (SMC_inw(dev, LAN91C96_MMU) & LAN91C96_MMUCR_NO_BUSY) - udelay (1); /* Wait until not busy */ + udelay(1); /* Wait until not busy */ /* error or good, tell the card to get rid of this packet */ SMC_outw(dev, LAN91C96_MMUCR_RELEASE_RX, LAN91C96_MMU); while (SMC_inw(dev, LAN91C96_MMU) & LAN91C96_MMUCR_NO_BUSY) - udelay (1); /* Wait until not busy */ + udelay(1); /* Wait until not busy */ if (!is_error) { /* Pass the packet up to the protocol layers. */ diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c index 5754c3106c..52bbf05a1e 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -266,7 +266,7 @@ static inline void smc_wait_mmu_release_complete (struct eth_device *dev) /* assume bank 2 selected */ while (SMC_inw (dev, MMU_CMD_REG) & MC_BUSY) { - udelay (1); /* Wait until not busy */ + udelay(1); /* Wait until not busy */ if (++count > 200) break; } @@ -318,7 +318,7 @@ static void smc_reset (struct eth_device *dev) SMC_SELECT_BANK (dev, 0); /* this should pause enough for the chip to be happy */ - udelay (10); + udelay(10); /* Disable transmit and receive functionality */ SMC_outw (dev, RCR_CLEAR, RCR_REG); @@ -333,7 +333,7 @@ static void smc_reset (struct eth_device *dev) smc_wait_mmu_release_complete (dev); SMC_outw (dev, MC_RESET, MMU_CMD_REG); while (SMC_inw (dev, MMU_CMD_REG) & MC_BUSY) - udelay (1); /* Wait until not busy */ + udelay(1); /* Wait until not busy */ /* Note: It doesn't seem that waiting for the MMU busy is needed here, but this is a place where future chipsets _COULD_ break. Be wary @@ -564,7 +564,7 @@ again: /* wait for MMU getting ready (low) */ while (SMC_inw (dev, MMU_CMD_REG) & MC_BUSY) { - udelay (10); + udelay(10); } PRINTK2 ("MMU ready\n"); @@ -583,7 +583,7 @@ again: /* wait for MMU getting ready (low) */ while (SMC_inw (dev, MMU_CMD_REG) & MC_BUSY) { - udelay (10); + udelay(10); } PRINTK2 ("MMU ready\n"); @@ -957,19 +957,19 @@ static word smc_read_phy_register (struct eth_device *dev, byte phyreg) for (i = 0; i < sizeof bits; ++i) { /* Clock Low - output data */ SMC_outw (dev, mii_reg | bits[i], MII_REG); - udelay (SMC_PHY_CLOCK_DELAY); + udelay(SMC_PHY_CLOCK_DELAY); /* Clock Hi - input data */ SMC_outw (dev, mii_reg | bits[i] | MII_MCLK, MII_REG); - udelay (SMC_PHY_CLOCK_DELAY); + udelay(SMC_PHY_CLOCK_DELAY); bits[i] |= SMC_inw (dev, MII_REG) & MII_MDI; } /* Return to idle state */ /* Set clock to low, data to low, and output tristated */ SMC_outw (dev, mii_reg, MII_REG); - udelay (SMC_PHY_CLOCK_DELAY); + udelay(SMC_PHY_CLOCK_DELAY); /* Restore original bank select */ SMC_SELECT_BANK (dev, oldBank); @@ -1078,19 +1078,19 @@ static void smc_write_phy_register (struct eth_device *dev, byte phyreg, for (i = 0; i < sizeof bits; ++i) { /* Clock Low - output data */ SMC_outw (dev, mii_reg | bits[i], MII_REG); - udelay (SMC_PHY_CLOCK_DELAY); + udelay(SMC_PHY_CLOCK_DELAY); /* Clock Hi - input data */ SMC_outw (dev, mii_reg | bits[i] | MII_MCLK, MII_REG); - udelay (SMC_PHY_CLOCK_DELAY); + udelay(SMC_PHY_CLOCK_DELAY); bits[i] |= SMC_inw (dev, MII_REG) & MII_MDI; } /* Return to idle state */ /* Set clock to low, data to low, and output tristated */ SMC_outw (dev, mii_reg, MII_REG); - udelay (SMC_PHY_CLOCK_DELAY); + udelay(SMC_PHY_CLOCK_DELAY); /* Restore original bank select */ SMC_SELECT_BANK (dev, oldBank); -- cgit v1.2.3