staging: rtl8723bs: Remove function pointer read_chip_version

Remove function pointer read_chip_version and use
rtl8723b_read_chip_version directly to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/79b26478a2493a1d7c27f8e88e0bec56a653d082.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 451f54e5de09667c33be01325ce11defaa626a95..8c80e073584095cc3057ae6b81feb917ce99287a 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -21,8 +21,7 @@ void rtw_hal_read_chip_info(struct adapter *padapter)
 
 void rtw_hal_read_chip_version(struct adapter *padapter)
 {
-       if (padapter->HalFunc.read_chip_version)
-               padapter->HalFunc.read_chip_version(padapter);
+       rtl8723b_read_chip_version(padapter);
 }
 
 void rtw_hal_def_value_init(struct adapter *padapter)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 106f1124964a9aa8b1a387d5a1a59353e158f69c..578e8ebf07c652fa011173984d9c79d32fba8e46 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1610,7 +1610,7 @@ static struct hal_version ReadChipVersion8723B(struct adapter *padapter)
        return ChipVersion;
 }
 
-static void rtl8723b_read_chip_version(struct adapter *padapter)
+void rtl8723b_read_chip_version(struct adapter *padapter)
 {
        ReadChipVersion8723B(padapter);
 }
@@ -1823,8 +1823,6 @@ static void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_l
 
 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
 {
-       pHalFunc->read_chip_version = &rtl8723b_read_chip_version;
-
        pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8723B;
 
        pHalFunc->set_channel_handler = &PHY_SwChnl8723B;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 6d301b44fa237fa09d363e6ef22fc721d55544e2..9b0e9c0bf020cebbbe5759c7e188ccb84ab19179 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_chip_version)(struct adapter *padapter);
-
        void (*init_default_value)(struct adapter *padapter);
 
        void (*intf_chip_configure)(struct adapter *padapter);

diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
index a108ce89bce43298d6a154c403737f6b714c457c..040c9af06eeed1ad9ae0380d3326383e6f0e23c8 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
+++ b/drivers/staging/rtl8723bs/include/rtl8723b_recv.h
@@ -87,4 +87,6 @@ void rtl8723bs_free_recv_priv(struct adapter *padapter);
 void rtl8723b_query_rx_phy_status(union recv_frame *prframe, struct phy_stat *pphy_stat);
 void rtl8723b_process_phy_info(struct adapter *padapter, void *prframe);
 
+void rtl8723b_read_chip_version(struct adapter *padapter);
+
 #endif