Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: rtl8723bs: Remove function pointer read_adapter_info

Remove function pointer read_adapter_info and use
ReadAdapterInfo8723BS directly to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/24eec4df528051fee3cf850308e009f114e14288.1727966761.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Philipp Hortmann and committed by
Greg Kroah-Hartman
babb045c f6faa9db

+3 -7
+1 -2
drivers/staging/rtl8723bs/hal/hal_intf.c
··· 14 14 15 15 void rtw_hal_read_chip_info(struct adapter *padapter) 16 16 { 17 - if (padapter->HalFunc.read_adapter_info) 18 - padapter->HalFunc.read_adapter_info(padapter); 17 + ReadAdapterInfo8723BS(padapter); 19 18 } 20 19 21 20 void rtw_hal_read_chip_version(struct adapter *padapter)
+1 -3
drivers/staging/rtl8723bs/hal/sdio_halinit.c
··· 1132 1132 return _SUCCESS; 1133 1133 } 1134 1134 1135 - static void ReadAdapterInfo8723BS(struct adapter *padapter) 1135 + void ReadAdapterInfo8723BS(struct adapter *padapter) 1136 1136 { 1137 1137 /* Read EEPROM size before call any EEPROM function */ 1138 1138 padapter->EepromAddressSize = GetEEPROMSize8723B(padapter); ··· 1258 1258 struct hal_ops *pHalFunc = &padapter->HalFunc; 1259 1259 1260 1260 rtl8723b_set_hal_ops(pHalFunc); 1261 - 1262 - pHalFunc->read_adapter_info = &ReadAdapterInfo8723BS; 1263 1261 1264 1262 pHalFunc->enable_interrupt = &EnableInterrupt8723BSdio; 1265 1263 pHalFunc->disable_interrupt = &DisableInterrupt8723BSdio;
-2
drivers/staging/rtl8723bs/include/hal_intf.h
··· 162 162 typedef s32 (*c2h_id_filter)(u8 *c2h_evt); 163 163 164 164 struct hal_ops { 165 - void (*read_adapter_info)(struct adapter *padapter); 166 - 167 165 void (*enable_interrupt)(struct adapter *padapter); 168 166 void (*disable_interrupt)(struct adapter *padapter); 169 167 u8 (*check_ips_status)(struct adapter *padapter);
+1
drivers/staging/rtl8723bs/include/rtl8723b_recv.h
··· 90 90 void rtl8723b_read_chip_version(struct adapter *padapter); 91 91 void rtl8723bs_init_default_value(struct adapter *padapter); 92 92 void rtl8723bs_interface_configure(struct adapter *padapter); 93 + void ReadAdapterInfo8723BS(struct adapter *padapter); 93 94 94 95 #endif