From: Jes Sorensen Date: Wed, 3 Sep 2014 12:15:16 +0000 (+0200) Subject: staging: rtl8723au: Remove write-only variables hal_data_8723a.EEPROM[VP]ID X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=73cfb7b028e045f7fc9d3ad695b7bdc55c6e56bb;p=linux-beck.git staging: rtl8723au: Remove write-only variables hal_data_8723a.EEPROM[VP]ID Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c index b49bf33184de..26be40d7c16d 100644 --- a/drivers/staging/rtl8723au/hal/usb_halinit.c +++ b/drivers/staging/rtl8723au/hal/usb_halinit.c @@ -1217,26 +1217,6 @@ static void _ReadLEDSetting(struct rtw_adapter *Adapter, u8 *PROMContent, pledpriv->LedStrategy = HW_LED; } -static void Hal_EfuseParsePIDVID_8723AU(struct rtw_adapter *pAdapter, - u8 *hwinfo, bool AutoLoadFail) -{ - struct hal_data_8723a *pHalData = GET_HAL_DATA(pAdapter); - - if (AutoLoadFail) { - pHalData->EEPROMVID = 0; - pHalData->EEPROMPID = 0; - } else { - /* VID, PID */ - pHalData->EEPROMVID = - le16_to_cpu(*(u16 *)&hwinfo[EEPROM_VID_8723AU]); - pHalData->EEPROMPID = - le16_to_cpu(*(u16 *)&hwinfo[EEPROM_PID_8723AU]); - } - - MSG_8723A("EEPROM VID = 0x%4x\n", pHalData->EEPROMVID); - MSG_8723A("EEPROM PID = 0x%4x\n", pHalData->EEPROMPID); -} - static void Hal_EfuseParseMACAddr_8723AU(struct rtw_adapter *padapter, u8 *hwinfo, bool AutoLoadFail) { @@ -1269,8 +1249,6 @@ static void readAdapterInfo(struct rtw_adapter *padapter) Hal_InitPGData(padapter, hwinfo); Hal_EfuseParseIDCode(padapter, hwinfo); - Hal_EfuseParsePIDVID_8723AU(padapter, hwinfo, - pEEPROM->bautoload_fail_flag); Hal_EfuseParseEEPROMVer(padapter, hwinfo, pEEPROM->bautoload_fail_flag); Hal_EfuseParseMACAddr_8723AU(padapter, hwinfo, diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h b/drivers/staging/rtl8723au/include/rtl8723a_hal.h index 3b0b06d6e41e..ee203a572cb7 100644 --- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h +++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h @@ -280,10 +280,6 @@ struct hal_data_8723a { /* EEPROM setting. */ /* */ u8 EEPROMVersion; - u16 EEPROMVID; - u16 EEPROMPID; - u16 EEPROMSVID; - u16 EEPROMSDID; u8 EEPROMCustomerID; u8 EEPROMSubCustomerID; u8 EEPROMRegulatory;