iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: r8188eu: merge EFUSE_ShadowMapUpdate with its caller

Browse Source 
Merge the EFUSE_ShadowMapUpdate function into ReadAdapterInfo8188EU, which
is the only caller.

Merging the two functions makes it clearer that eeprom->efuse_eeprom_data
is in fact a temporary buffer that stores info read from efuses.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220709171000.180481-5-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Martin Kaiser 2022-07-09 19:09:50 +02:00 committed by Greg Kroah-Hartman
parent 1c4d6546c3
commit 14dbcfc4c9
3 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/r8188eu/core/rtw_efuse.c
View File

@ -72,33 +72,3 @@ ReadEFuseByte(
/* FIXME: return an error to caller */
}
/*-----------------------------------------------------------------------------
* Function: EFUSE_ShadowMapUpdate
*
* Overview: Transfer current EFUSE content to shadow init and modify map.
*
* Input: NONE
*
* Output: NONE
*
* Return: NONE
*
* Revised History:
* When Who Remark
* 11/13/2008 MHC Create Version 0.
*
*---------------------------------------------------------------------------*/
void EFUSE_ShadowMapUpdate(struct adapter *pAdapter)
{
struct eeprom_priv *pEEPROM = &pAdapter->eeprompriv;
if (pEEPROM->bautoload_fail_flag) {
memset(pEEPROM->efuse_eeprom_data, 0xFF, EFUSE_MAP_LEN_88E);
return;
}
rtl8188e_EfusePowerSwitch(pAdapter, true);
rtl8188e_ReadEFuse(pAdapter, 0, EFUSE_MAP_LEN_88E, pEEPROM->efuse_eeprom_data);
rtl8188e_EfusePowerSwitch(pAdapter, false);
}

11
drivers/staging/r8188eu/hal/usb_halinit.c
View File

@ -939,8 +939,15 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter)
eeprom->bautoload_fail_flag = !(eeValue & EEPROM_EN);
if (!(eeValue & BOOT_FROM_EEPROM))
EFUSE_ShadowMapUpdate(Adapter);
if (!(eeValue & BOOT_FROM_EEPROM)) {
if (eeprom->bautoload_fail_flag) {
memset(eeprom->efuse_eeprom_data, 0xFF, EFUSE_MAP_LEN_88E);
} else {
rtl8188e_EfusePowerSwitch(Adapter, true);
rtl8188e_ReadEFuse(Adapter, 0, EFUSE_MAP_LEN_88E, eeprom->efuse_eeprom_data);
rtl8188e_EfusePowerSwitch(Adapter, false);
}
}
/* parse the eeprom/efuse content */
Hal_EfuseParseIDCode88E(Adapter, eeprom->efuse_eeprom_data);

2
drivers/staging/r8188eu/include/rtw_efuse.h
View File

@ -8,6 +8,4 @@
void ReadEFuseByte(struct adapter *adapter, u16 _offset, u8 *pbuf);
void EFUSE_ShadowMapUpdate(struct adapter *adapter);
#endif