pinctrl: lynxpoint: Reuse struct intel_pinctrl in the driver

[linux.git] / drivers / staging / rtl8712 / rtl871x_eeprom.c

diff --git a/drivers/staging/rtl8712/rtl871x_eeprom.c b/drivers/staging/rtl8712/rtl871x_eeprom.c
index 0027d8eb22fa720b133c427e9c493d08b8da13ba..221bf92e1b1c3f3a2f00faf4be9b24d6708c380b 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_eeprom.c
+++ b/drivers/staging/rtl8712/rtl871x_eeprom.c
@@ -150,7 +150,7 @@ void r8712_eeprom_write16(struct _adapter *padapter, u16 reg, u16 data)
        x |= _EEM1 | _EECS;
        r8712_write8(padapter, EE_9346CR, x);
        shift_out_bits(padapter, EEPROM_EWEN_OPCODE, 5);
-       if (padapter->EepromAddressSize == 8)   /*CF+ and SDIO*/
+       if (padapter->eeprom_address_size == 8) /*CF+ and SDIO*/
                shift_out_bits(padapter, 0, 6);
        else    /* USB */
                shift_out_bits(padapter, 0, 4);
@@ -165,7 +165,7 @@ void r8712_eeprom_write16(struct _adapter *padapter, u16 reg, u16 data)
         */
        shift_out_bits(padapter, EEPROM_WRITE_OPCODE, 3);
        /* select which word in the EEPROM that we are writing to. */
-       shift_out_bits(padapter, reg, padapter->EepromAddressSize);
+       shift_out_bits(padapter, reg, padapter->eeprom_address_size);
        /* write the data to the selected EEPROM word. */
        shift_out_bits(padapter, data, 16);
        if (wait_eeprom_cmd_done(padapter)) {
@@ -207,7 +207,7 @@ u16 r8712_eeprom_read16(struct _adapter *padapter, u16 reg) /*ReadEEprom*/
         * The opcode is 3bits in length, reg is 6 bits long
         */
        shift_out_bits(padapter, EEPROM_READ_OPCODE, 3);
-       shift_out_bits(padapter, reg, padapter->EepromAddressSize);
+       shift_out_bits(padapter, reg, padapter->eeprom_address_size);
        /* Now read the data (16 bits) in from the selected EEPROM word */
        data = shift_in_bits(padapter);
        eeprom_clean(padapter);