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>

diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index ec95d3ec3170a949c6df173ff0eee85066ef63da..efc4b44caad3946ee38a5af3c499c357b7bf214c 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -14,8 +14,7 @@ void rtw_hal_chip_configure(struct adapter *padapter)
 
 void rtw_hal_read_chip_info(struct adapter *padapter)
 {
-       if (padapter->HalFunc.read_adapter_info)
-               padapter->HalFunc.read_adapter_info(padapter);
+       ReadAdapterInfo8723BS(padapter);
 }
 
 void rtw_hal_read_chip_version(struct adapter *padapter)

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 6a56a5db5a5f7173d78c0f4e6c94b1c99fe675c3..a6766a98042c39b58550255dd886f14bb5aa276a 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -1132,7 +1132,7 @@ static s32 _ReadAdapterInfo8723BS(struct adapter *padapter)
        return _SUCCESS;
 }
 
-static void ReadAdapterInfo8723BS(struct adapter *padapter)
+void ReadAdapterInfo8723BS(struct adapter *padapter)
 {
        /*  Read EEPROM size before call any EEPROM function */
        padapter->EepromAddressSize = GetEEPROMSize8723B(padapter);
@@ -1259,8 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)
 
        rtl8723b_set_hal_ops(pHalFunc);
 
-       pHalFunc->read_adapter_info = &ReadAdapterInfo8723BS;
-
        pHalFunc->enable_interrupt = &EnableInterrupt8723BSdio;
        pHalFunc->disable_interrupt = &DisableInterrupt8723BSdio;
        pHalFunc->check_ips_status = &CheckIPSStatus;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 1932f93d89c701dd76d99b4a164f1768d4db1ae2..ed303a623e1b83acade826e07dc7e49aad65f56b 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {
 typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
 
 struct hal_ops {
-       void (*read_adapter_info)(struct adapter *padapter);
-
        void (*enable_interrupt)(struct adapter *padapter);
        void (*disable_interrupt)(struct adapter *padapter);
        u8 (*check_ips_status)(struct adapter *padapter);

diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
index dbd051a34d90dfc2e0d19b02f1cc4c1b38f4b534..783f64de0aec2325c23166dd00969b2d2e7b6852 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
@@ -90,5 +90,6 @@ void rtl8723b_process_phy_info(struct adapter *padapter, void *prframe);
 void rtl8723b_read_chip_version(struct adapter *padapter);
 void rtl8723bs_init_default_value(struct adapter *padapter);
 void rtl8723bs_interface_configure(struct adapter *padapter);
+void ReadAdapterInfo8723BS(struct adapter *padapter);
 
 #endif