colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: rtl8139: Pass private data into rtl8139_eeprom_delay()

Browse Source 
Instead of always calling rtl8139_eeprom_delay() with priv->ioaddr,
call it with priv and let the function access priv->ioaddr. This
reduces code duplication and has no impact, since the compiler will
inline this as needed anyway.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Marek Vasut
2020-05-09 22:34:40 +02:00
committed by Tom Rini
parent 3feb6f7ff6
commit 26f59c28bd
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/rtl8139.c
View File

@@ -220,13 +220,13 @@ static unsigned char rx_ring[RX_BUF_LEN + 16] __aligned(4);
#define EE_READ_CMD 6 #define EE_READ_CMD 6
#define EE_ERASE_CMD 7 #define EE_ERASE_CMD 7
static void rtl8139_eeprom_delay(uintptr_t regbase) static void rtl8139_eeprom_delay(struct rtl8139_priv *priv)
{ {
/* /*
* Delay between EEPROM clock transitions. * Delay between EEPROM clock transitions.
* No extra delay is needed with 33MHz PCI, but 66MHz may change this. * No extra delay is needed with 33MHz PCI, but 66MHz may change this.
*/ */
inl(regbase + RTL_REG_CFG9346); inl(priv->ioaddr + RTL_REG_CFG9346);
} }
static int rtl8139_read_eeprom(struct rtl8139_priv *priv, static int rtl8139_read_eeprom(struct rtl8139_priv *priv,
@@ -240,32 +240,32 @@ static int rtl8139_read_eeprom(struct rtl8139_priv *priv,
outb(EE_ENB & ~EE_CS, ee_addr); outb(EE_ENB & ~EE_CS, ee_addr);
outb(EE_ENB, ee_addr); outb(EE_ENB, ee_addr);
rtl8139_eeprom_delay(priv->ioaddr); rtl8139_eeprom_delay(priv);
/* Shift the read command bits out. */ /* Shift the read command bits out. */
for (i = 4 + addr_len; i >= 0; i--) { for (i = 4 + addr_len; i >= 0; i--) {
dataval = (read_cmd & BIT(i)) ? EE_DATA_WRITE : 0; dataval = (read_cmd & BIT(i)) ? EE_DATA_WRITE : 0;
outb(EE_ENB | dataval, ee_addr); outb(EE_ENB | dataval, ee_addr);
rtl8139_eeprom_delay(priv->ioaddr); rtl8139_eeprom_delay(priv);
outb(EE_ENB | dataval | EE_SHIFT_CLK, ee_addr); outb(EE_ENB | dataval | EE_SHIFT_CLK, ee_addr);
rtl8139_eeprom_delay(priv->ioaddr); rtl8139_eeprom_delay(priv);
} }
outb(EE_ENB, ee_addr); outb(EE_ENB, ee_addr);
rtl8139_eeprom_delay(priv->ioaddr); rtl8139_eeprom_delay(priv);
for (i = 16; i > 0; i--) { for (i = 16; i > 0; i--) {
outb(EE_ENB | EE_SHIFT_CLK, ee_addr); outb(EE_ENB | EE_SHIFT_CLK, ee_addr);
rtl8139_eeprom_delay(priv->ioaddr); rtl8139_eeprom_delay(priv);
retval <<= 1; retval <<= 1;
retval |= inb(ee_addr) & EE_DATA_READ; retval |= inb(ee_addr) & EE_DATA_READ;
outb(EE_ENB, ee_addr); outb(EE_ENB, ee_addr);
rtl8139_eeprom_delay(priv->ioaddr); rtl8139_eeprom_delay(priv);
} }
/* Terminate the EEPROM access. */ /* Terminate the EEPROM access. */
outb(~EE_CS, ee_addr); outb(~EE_CS, ee_addr);
rtl8139_eeprom_delay(priv->ioaddr); rtl8139_eeprom_delay(priv);
return retval; return retval;
} }