staging: r8188eu: remove haldata's EEPROMSubCustomerID

It is used only in a (disabled) debug print.

We can now remove two functions that parsed eeprom info and populated
haldata components.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211111212644.9011-3-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 9efdc846ba33012875f8ccff1e02e8545de8993c..566b49fd7478be635824a3653f1496578e0fa84f 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1584,14 +1584,6 @@ void rtl8188e_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo, bool Auto
        DBG_88E("mlmepriv.ChannelPlan = 0x%02x\n", padapter->mlmepriv.ChannelPlan);
 }
 
-void Hal_EfuseParseCustomerID88E(struct adapter *padapter, u8 *hwinfo, bool AutoLoadFail)
-{
-       struct hal_data_8188e   *pHalData = GET_HAL_DATA(padapter);
-
-       if (AutoLoadFail)
-               pHalData->EEPROMSubCustomerID = 0;
-}
-
 void Hal_ReadAntennaDiversity88E(struct adapter *pAdapter, u8 *PROMContent, bool AutoLoadFail)
 {
        struct hal_data_8188e   *pHalData = GET_HAL_DATA(pAdapter);

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index caef99d0926f568571b66b3364300b8e1d371816..1625873aa742edc5183142711fb9fb68d2e657c8 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -980,21 +980,6 @@ static void _ReadLEDSetting(struct adapter *Adapter, u8 *PROMContent, bool Autol
        haldata->bLedOpenDrain = true;/*  Support Open-drain arrangement for controlling the LED. */
 }
 
-static void Hal_EfuseParsePIDVID_8188EU(struct adapter *adapt, u8 *hwinfo, bool AutoLoadFail)
-{
-       struct hal_data_8188e   *haldata = GET_HAL_DATA(adapt);
-
-       if (!AutoLoadFail) {
-               /*  Customer ID, 0x00 and 0xff are reserved for Realtek. */
-               haldata->EEPROMSubCustomerID = EEPROM_Default_SubCustomerID;
-       } else {
-               /*  Customer ID, 0x00 and 0xff are reserved for Realtek. */
-               haldata->EEPROMSubCustomerID    = EEPROM_Default_SubCustomerID;
-       }
-
-       DBG_88E("SubCustomer ID: 0x%02X\n", haldata->EEPROMSubCustomerID);
-}
-
 static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool AutoLoadFail)
 {
        u16 i;
@@ -1019,7 +1004,6 @@ readAdapterInfo_8188EU(
 
        /* parse the eeprom/efuse content */
        Hal_EfuseParseIDCode88E(adapt, eeprom->efuse_eeprom_data);
-       Hal_EfuseParsePIDVID_8188EU(adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
        Hal_EfuseParseMACAddr_8188EU(adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
 
        Hal_ReadPowerSavingMode88E(adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
@@ -1027,7 +1011,6 @@ readAdapterInfo_8188EU(
        Hal_EfuseParseEEPROMVer88E(adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
        rtl8188e_EfuseParseChnlPlan(adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
        Hal_EfuseParseXtal_8188E(adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
-       Hal_EfuseParseCustomerID88E(adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
        Hal_ReadAntennaDiversity88E(adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
        Hal_EfuseParseBoardType88E(adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
        Hal_ReadThermalMeter_88E(adapt, 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 19aac5c7cffbeb575b1286b6b4ba00c3ec9322d4..3593334e24b6451336db8398e3a398a53c03e1cf 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -177,7 +177,6 @@ struct hal_data_8188e {
        /*  EEPROM setting. */
        u16     EEPROMSVID;
        u16     EEPROMSDID;
-       u8      EEPROMSubCustomerID;
        u8      EEPROMVersion;
        u8      EEPROMRegulatory;
 
@@ -327,8 +326,6 @@ void Hal_EfuseParseEEPROMVer88E(struct adapter *padapter, u8 *hwinfo,
                                bool AutoLoadFail);
 void rtl8188e_EfuseParseChnlPlan(struct adapter *padapter, u8 *hwinfo,
                                 bool AutoLoadFail);
-void Hal_EfuseParseCustomerID88E(struct adapter *padapter, u8 *hwinfo,
-                                bool AutoLoadFail);
 void Hal_ReadAntennaDiversity88E(struct adapter *pAdapter,u8 *PROMContent,
                                 bool AutoLoadFail);
 void Hal_ReadThermalMeter_88E(struct adapter * dapter, u8 *PROMContent,

diff --git a/drivers/staging/r8188eu/include/rtl8188e_spec.h b/drivers/staging/r8188eu/include/rtl8188e_spec.h
index 8c62e8a2ca407820480605f9915071b29720063e..7dd55212e1bec8ebd2aabdf95893dfde04fe19fd 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_spec.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_spec.h
@@ -1345,7 +1345,6 @@ Current IOREG MAP
 #define        EEPROM_DEFAULT_BT_OPTION                0x10
 
 /*  For debug */
-#define EEPROM_Default_SubCustomerID           0xCD
 #define EEPROM_Default_Version                 0
 
 #define EEPROM_CHANNEL_PLAN_FCC                        0x0