staging: r8188eu: remove haldata's EEPROMCustomerID

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

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211111212644.9011-2-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 84f3cfd..9efdc84 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1588,13 +1588,8 @@ void Hal_EfuseParseCustomerID88E(struct adapter *padapter, u8 *hwinfo, bool Auto
 {
        struct hal_data_8188e   *pHalData = GET_HAL_DATA(padapter);
 
-       if (!AutoLoadFail) {
-               pHalData->EEPROMCustomerID = hwinfo[EEPROM_CUSTOMERID_88E];
-       } else {
-               pHalData->EEPROMCustomerID = 0;
+       if (AutoLoadFail)
                pHalData->EEPROMSubCustomerID = 0;
-       }
-       DBG_88E("EEPROM Customer ID: 0x%2x\n", pHalData->EEPROMCustomerID);
 }
 
 void Hal_ReadAntennaDiversity88E(struct adapter *pAdapter, u8 *PROMContent, bool AutoLoadFail)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 563b7c0..caef99d 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -986,15 +986,13 @@ static void Hal_EfuseParsePIDVID_8188EU(struct adapter *adapt, u8 *hwinfo, bool
 
        if (!AutoLoadFail) {
                /*  Customer ID, 0x00 and 0xff are reserved for Realtek. */
-               haldata->EEPROMCustomerID = *(u8 *)&hwinfo[EEPROM_CUSTOMERID_88E];
                haldata->EEPROMSubCustomerID = EEPROM_Default_SubCustomerID;
        } else {
                /*  Customer ID, 0x00 and 0xff are reserved for Realtek. */
-               haldata->EEPROMCustomerID               = EEPROM_Default_CustomerID;
                haldata->EEPROMSubCustomerID    = EEPROM_Default_SubCustomerID;
        }
 
-       DBG_88E("Customer ID: 0x%02X, SubCustomer ID: 0x%02X\n", haldata->EEPROMCustomerID, haldata->EEPROMSubCustomerID);
+       DBG_88E("SubCustomer ID: 0x%02X\n", haldata->EEPROMSubCustomerID);
 }
 
 static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool AutoLoadFail)

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 84fa659..19aac5c 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      EEPROMCustomerID;
        u8      EEPROMSubCustomerID;
        u8      EEPROMVersion;
        u8      EEPROMRegulatory;

diff --git a/drivers/staging/r8188eu/include/rtl8188e_spec.h b/drivers/staging/r8188eu/include/rtl8188e_spec.h
index cfab7ad..8c62e8a 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_spec.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_spec.h
@@ -1345,8 +1345,6 @@ Current IOREG MAP
 #define        EEPROM_DEFAULT_BT_OPTION                0x10
 
 /*  For debug */
-#define EEPROM_Default_CustomerID              0xAB
-#define        EEPROM_Default_CustomerID_8188E         0x00
 #define EEPROM_Default_SubCustomerID           0xCD
 #define EEPROM_Default_Version                 0