staging: r8188eu: do not extract eeprom version from the fuses

EEPROMVersion in struct hal_data_8188e is not used. There's no need to
parse the fuses and extract the version.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211125151436.5895-5-martin@kaiser.cx
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 b7d5b5775ff5df05da0c2a7c549b5d80495db0d2..d5aee084def924e72f5cb438706504c1d56c3d52 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1218,19 +1218,6 @@ void Hal_EfuseParseBoardType88E(struct adapter *pAdapter, u8 *hwinfo, bool AutoL
        DBG_88E("Board Type: 0x%2x\n", pHalData->BoardType);
 }
 
-void Hal_EfuseParseEEPROMVer88E(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail)
-{
-       struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
-
-       if (!AutoLoadFail) {
-               pHalData->EEPROMVersion = hwinfo[EEPROM_VERSION_88E];
-               if (pHalData->EEPROMVersion == 0xFF)
-                       pHalData->EEPROMVersion = EEPROM_Default_Version;
-       } else {
-               pHalData->EEPROMVersion = 1;
-       }
-}
-
 void rtl8188e_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail)
 {
        padapter->mlmepriv.ChannelPlan =

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 902afbb4aeb8b602e3feddec56c8bd9e0363a6d1..fdaaf6e5bdda64580114e5cf5347da28cd0e780f 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1020,7 +1020,6 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter)
 
        Hal_ReadPowerSavingMode88E(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
        Hal_ReadTxPowerInfo88E(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
-       Hal_EfuseParseEEPROMVer88E(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
        rtl8188e_EfuseParseChnlPlan(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
        Hal_EfuseParseXtal_8188E(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
        Hal_ReadAntennaDiversity88E(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 31a46f20495470932b35affa1610386faf1a9de5..e4d6922bc70393d19bbe24a609db02ddaec0b116 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 {
        /*  EEPROM setting. */
        u16     EEPROMSVID;
        u16     EEPROMSDID;
-       u8      EEPROMVersion;
        u8      EEPROMRegulatory;
 
        u8      bTXPowerDataReadFromEEPORM;
@@ -319,8 +318,6 @@ void Hal_EfuseParseIDCode88E(struct adapter *padapter, u8 *hwinfo);
 void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *hwinfo,
                            bool AutoLoadFail);
 
-void Hal_EfuseParseEEPROMVer88E(struct adapter *padapter, u8 *hwinfo,
-                               bool AutoLoadFail);
 void rtl8188e_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo,
                                 bool AutoLoadFail);
 void Hal_ReadAntennaDiversity88E(struct adapter *pAdapter,u8 *PROMContent,

diff --git a/drivers/staging/r8188eu/include/rtl8188e_spec.h b/drivers/staging/r8188eu/include/rtl8188e_spec.h
index 7dd55212e1bec8ebd2aabdf95893dfde04fe19fd..d56e1c052b84e7bfa4802770e02bdce9c6c811ca 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_spec.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_spec.h
@@ -1284,7 +1284,6 @@ Current IOREG MAP
 #define        EEPROM_RF_BOARD_OPTION_88E              0xC1
 #define        EEPROM_RF_FEATURE_OPTION_88E            0xC2
 #define        EEPROM_RF_BT_SETTING_88E                0xC3
-#define        EEPROM_VERSION_88E                      0xC4
 #define        EEPROM_CUSTOMERID_88E                   0xC5
 #define        EEPROM_RF_ANTENNA_OPT_88E               0xC9