From: Martin Kaiser Date: Sun, 18 Jul 2021 17:36:01 +0000 (+0200) Subject: staging: rtl8188eu: merge two functions X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d2785a198b7c484f8e36ad2fd147c2a7ba243922;p=linux.git staging: rtl8188eu: merge two functions All that rtw_hal_read_chip_info does is call _ReadPROMContent. Merge the two functions. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20210718173610.894-1-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c index 2a47e9b444d59..3c9a2c99c0d4f 100644 --- a/drivers/staging/rtl8188eu/hal/usb_halinit.c +++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c @@ -990,25 +990,18 @@ static void readAdapterInfo_8188EU(struct adapter *adapt) Hal_ReadThermalMeter_88E(adapt, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag); } -static void _ReadPROMContent(struct adapter *Adapter) +void rtw_hal_read_chip_info(struct adapter *Adapter) { struct eeprom_priv *eeprom = GET_EEPROM_EFUSE_PRIV(Adapter); - u8 eeValue; + u8 eeValue = usb_read8(Adapter, REG_9346CR); - /* check system boot selection */ - eeValue = usb_read8(Adapter, REG_9346CR); - eeprom->EepromOrEfuse = (eeValue & BOOT_FROM_EEPROM) ? true : false; - eeprom->bautoload_fail_flag = (eeValue & EEPROM_EN) ? false : true; + eeprom->EepromOrEfuse = (eeValue & BOOT_FROM_EEPROM) ? true : false; + eeprom->bautoload_fail_flag = (eeValue & EEPROM_EN) ? false : true; Hal_InitPGData88E(Adapter); readAdapterInfo_8188EU(Adapter); } -void rtw_hal_read_chip_info(struct adapter *Adapter) -{ - _ReadPROMContent(Adapter); -} - #define GPIO_DEBUG_PORT_NUM 0 static void rtl8192cu_trigger_gpio_0(struct adapter *adapt) {