net: rtl8139: Pass private data into rtl8139_eeprom_delay()

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>

diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index dff77de..ae5d125 100644 (file)
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -220,13 +220,13 @@ static unsigned char rx_ring[RX_BUF_LEN + 16] __aligned(4);
 #define EE_READ_CMD    6
 #define EE_ERASE_CMD   7
 
 #define EE_READ_CMD    6
 #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.
         * No extra delay is needed with 33MHz PCI, but 66MHz may change this.
         */
 {
        /*
         * Delay between EEPROM clock transitions.
         * 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_addr);
 
        outb(EE_ENB & ~EE_CS, ee_addr);
        outb(EE_ENB, ee_addr);

-       rtl8139_eeprom_delay(priv->ioaddr);
+       rtl8139_eeprom_delay(priv);

 
        /* Shift the read command bits out. */
        for (i = 4 + addr_len; i >= 0; i--) {
                dataval = (read_cmd & BIT(i)) ? EE_DATA_WRITE : 0;
                outb(EE_ENB | dataval, ee_addr);
 
        /* Shift the read command bits out. */
        for (i = 4 + addr_len; i >= 0; i--) {
                dataval = (read_cmd & BIT(i)) ? EE_DATA_WRITE : 0;
                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--) {
                outb(EE_ENB | EE_SHIFT_CLK, ee_addr);
 
        for (i = 16; i > 0; i--) {
                outb(EE_ENB | EE_SHIFT_CLK, ee_addr);

-               rtl8139_eeprom_delay(priv->ioaddr);
+               rtl8139_eeprom_delay(priv);

                retval <<= 1;
                retval |= inb(ee_addr) & EE_DATA_READ;
                outb(EE_ENB, ee_addr);
                retval <<= 1;
                retval |= inb(ee_addr) & EE_DATA_READ;
                outb(EE_ENB, ee_addr);

-               rtl8139_eeprom_delay(priv->ioaddr);
+               rtl8139_eeprom_delay(priv);

        }
 
        /* Terminate the EEPROM access. */
        outb(~EE_CS, ee_addr);
        }
 
        /* Terminate the EEPROM access. */
        outb(~EE_CS, ee_addr);

-       rtl8139_eeprom_delay(priv->ioaddr);
+       rtl8139_eeprom_delay(priv);

 
        return retval;
 }
 
        return retval;
 }