Messages in this thread Patch in this message | | | From | Martin Kaiser <> | Subject | [PATCH 6/7] staging: r8188eu: merge three small functions | Date | Thu, 11 Nov 2021 22:26:43 +0100 |
| |
ReadAdapterInfo8188EU calls _ReadAdapterInfo8188EU. _ReadAdapterInfo8188EU calls _ReadPROMContent.
Each of these functions is small and has only one caller. Move all their code into ReadAdapterInfo8188EU.
Signed-off-by: Martin Kaiser <martin@kaiser.cx> --- drivers/staging/r8188eu/hal/usb_halinit.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index 119523d9c38a..004622f7a85f 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1018,13 +1018,14 @@ readAdapterInfo_8188EU( _ReadLEDSetting(adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag); } -static void _ReadPROMContent( - struct adapter *Adapter - ) +void ReadAdapterInfo8188EU(struct adapter *Adapter) { struct eeprom_priv *eeprom = &Adapter->eeprompriv; u8 eeValue; + /* Read EEPROM size before call any EEPROM function */ + Adapter->EepromAddressSize = GetEEPROMSize8188E(Adapter); + /* check system boot selection */ eeValue = rtw_read8(Adapter, REG_9346CR); eeprom->EepromOrEfuse = (eeValue & BOOT_FROM_EEPROM) ? true : false; @@ -1037,21 +1038,6 @@ static void _ReadPROMContent( readAdapterInfo_8188EU(Adapter); } -static int _ReadAdapterInfo8188EU(struct adapter *Adapter) -{ - _ReadPROMContent(Adapter); - - return _SUCCESS; -} - -void ReadAdapterInfo8188EU(struct adapter *Adapter) -{ - /* Read EEPROM size before call any EEPROM function */ - Adapter->EepromAddressSize = GetEEPROMSize8188E(Adapter); - - _ReadAdapterInfo8188EU(Adapter); -} - static void ResumeTxBeacon(struct adapter *adapt) { struct hal_data_8188e *haldata = GET_HAL_DATA(adapt); -- 2.20.1
| |