staging: r8188eu: EepromAddressSize is set but not used

EepromAddressSize in struct adapter is set but not used. Remove it and
remove the now unused function GetEEPROMSize8188E().

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220225120843.10674-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 53ebea3117232b15f4ebc8599ee1e145e389fbb7..6811be95da9adb8cd13923bd79a5874956c02f0f 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -534,21 +534,6 @@ void hal_notch_filter_8188e(struct adapter *adapter, bool enable)
                rtw_write8(adapter, rOFDM0_RxDSP + 1, rtw_read8(adapter, rOFDM0_RxDSP + 1) & ~BIT(1));
 }
 
-u8 GetEEPROMSize8188E(struct adapter *padapter)
-{
-       u8 size = 0;
-       u32     cr;
-
-       cr = rtw_read16(padapter, REG_9346CR);
-       /*  6: EEPROM used is 93C46, 4: boot from E-Fuse. */
-       size = (cr & BOOT_FROM_EEPROM) ? 6 : 4;
-
-       netdev_dbg(padapter->pnetdev, "EEPROM type is %s\n",
-                  size == 4 ? "E-FUSE" : "93C46");
-
-       return size;
-}
-
 /*  */
 /*  */
 /*  LLT R/W/Init function */

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index d7dcef3ece3dfc601159aabdf2074a5b611c6583..6ada22a9616e18b09c37c6e2ec40fb0222c8e30c 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -835,9 +835,6 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter)
        struct led_priv *ledpriv = &Adapter->ledpriv;
        u8 eeValue;
 
-       /*  Read EEPROM size before call any EEPROM function */
-       Adapter->EepromAddressSize = GetEEPROMSize8188E(Adapter);
-
        /* check system boot selection */
        eeValue = rtw_read8(Adapter, REG_9346CR);
        eeprom->EepromOrEfuse           = (eeValue & BOOT_FROM_EEPROM);

diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index 894e70a0d506fd16e313096be615750395e49b3a..09fc27082f7ce09b2bdaa2615f33d41cf0d79c40 100644 (file)
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -177,7 +177,6 @@ struct adapter {
        s32     bSurpriseRemoved;
        s32     bCardDisableWOHSM;
 
-       u8      EepromAddressSize;
        u8      hw_init_completed;
        s8      signal_strength;
 

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 44321a53a34523d70bcee731177acc9107a92eaa..82cb4f7f4d3ec2c7a9e4b37b4472495914711947 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -176,7 +176,6 @@ struct hal_data_8188e {
 s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy);
 
 /*  EFuse */
-u8 GetEEPROMSize8188E(struct adapter *padapter);
 void Hal_EfuseParseIDCode88E(struct adapter *padapter, u8 *hwinfo);
 void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *hwinfo,
                            bool AutoLoadFail);