staging: r8188eu: remove haldata's EEPROMVID / PID

They are used only in a (disabled) debug print.

In practice, lsusb can be used to read the actual vid and pid.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211111212644.9011-1-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index ef1ae95d7db08ebfcdd7bc78af6dcd25e8ec7843..563b7c0a2c900048017586b52d66c79da755d1be 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -985,23 +985,15 @@ static void Hal_EfuseParsePIDVID_8188EU(struct adapter *adapt, u8 *hwinfo, bool
        struct hal_data_8188e   *haldata = GET_HAL_DATA(adapt);
 
        if (!AutoLoadFail) {
-               /*  VID, PID */
-               haldata->EEPROMVID = EF2BYTE(*(__le16 *)&hwinfo[EEPROM_VID_88EU]);
-               haldata->EEPROMPID = EF2BYTE(*(__le16 *)&hwinfo[EEPROM_PID_88EU]);
-
                /*  Customer ID, 0x00 and 0xff are reserved for Realtek. */
                haldata->EEPROMCustomerID = *(u8 *)&hwinfo[EEPROM_CUSTOMERID_88E];
                haldata->EEPROMSubCustomerID = EEPROM_Default_SubCustomerID;
        } else {
-               haldata->EEPROMVID                      = EEPROM_Default_VID;
-               haldata->EEPROMPID                      = EEPROM_Default_PID;
-
                /*  Customer ID, 0x00 and 0xff are reserved for Realtek. */
                haldata->EEPROMCustomerID               = EEPROM_Default_CustomerID;
                haldata->EEPROMSubCustomerID    = EEPROM_Default_SubCustomerID;
        }
 
-       DBG_88E("VID = 0x%04X, PID = 0x%04X\n", haldata->EEPROMVID, haldata->EEPROMPID);
        DBG_88E("Customer ID: 0x%02X, SubCustomer ID: 0x%02X\n", haldata->EEPROMCustomerID, haldata->EEPROMSubCustomerID);
 }
 

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index d7db1dfc39d0a9ae45dac365802955e24cd194dc..84fa659720396c96f4f285daa3d96ad59a9a0f89 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -175,8 +175,6 @@ struct hal_data_8188e {
        u8      BoardType;
 
        /*  EEPROM setting. */
-       u16     EEPROMVID;
-       u16     EEPROMPID;
        u16     EEPROMSVID;
        u16     EEPROMSDID;
        u8      EEPROMCustomerID;

diff --git a/drivers/staging/r8188eu/include/rtl8188e_spec.h b/drivers/staging/r8188eu/include/rtl8188e_spec.h
index 01aeaa4ac605a892d12f10236495227c4e047845..cfab7ad0894778520c2fe4f3551498ca394d23a6 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_PID                     0x1234
-#define EEPROM_Default_VID                     0x5678
 #define EEPROM_Default_CustomerID              0xAB
 #define        EEPROM_Default_CustomerID_8188E         0x00
 #define EEPROM_Default_SubCustomerID           0xCD