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

staging: r8188eu: remove EepromOrEfuse from struct eeprom_priv

Browse Source 
The EepromOrEfuse flag in struct eeprom_priv is used only in the
ReadAdapterInfo8188EU function. We can remove EepromOrEfuse from struct
eeprom_priv.

As the meaning of EepromOrEfuse isn't obvious, there is a macro
is_boot_from_eeprom that's used for checking the value. We don't need the
macro, writing the check as !(eeValue & BOOT_FROM_EEPROM) makes it clear
what is checked.

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

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

@ -937,10 +937,9 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter)
if (res)
return;
eeprom->EepromOrEfuse = (eeValue & BOOT_FROM_EEPROM);
eeprom->bautoload_fail_flag = !(eeValue & EEPROM_EN);
if (!is_boot_from_eeprom(Adapter))
if (!(eeValue & BOOT_FROM_EEPROM))
EFUSE_ShadowMapUpdate(Adapter);
/* parse the eeprom/efuse content */

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

@ -16,8 +16,6 @@ enum hw_variables {
typedef s32 (*c2h_id_filter)(u8 id);
#define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse)
void rtl8188eu_interface_configure(struct adapter *adapt);
void ReadAdapterInfo8188EU(struct adapter *Adapter);
void rtl8188eu_init_default_value(struct adapter *adapt);

1
drivers/staging/r8188eu/include/rtw_eeprom.h
View File

@ -12,7 +12,6 @@
struct eeprom_priv {
u8 bautoload_fail_flag;
u8 mac_addr[ETH_ALEN] __aligned(2); /* PermanentAddress */
u8 EepromOrEfuse;
u8 efuse_eeprom_data[HWSET_MAX_SIZE_512] __aligned(4);
};