staging: rtl8723bs: Remove function pointer dm_init

Remove function pointer dm_init and use rtl8723b_init_dm_priv directly to
increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/e25134aacd3f784300f527d7e367b9f0f066254a.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 de7dfaa69c66a0fea774263d351c20cc91049f63..760ba45de8f7651b5f961aa5193e17958fe5b0c0 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -39,8 +39,7 @@ void rtw_hal_free_data(struct adapter *padapter)
 
 void rtw_hal_dm_init(struct adapter *padapter)
 {
-       if (padapter->HalFunc.dm_init)
-               padapter->HalFunc.dm_init(padapter);
+       rtl8723b_init_dm_priv(padapter);
 }
 
 void rtw_hal_dm_deinit(struct adapter *padapter)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 867021ed31bf7c03b44f784b365d83e79a4d8133..106f1124964a9aa8b1a387d5a1a59353e158f69c 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -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->dm_init = &rtl8723b_init_dm_priv;
-
        pHalFunc->read_chip_version = &rtl8723b_read_chip_version;
 
        pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8723B;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index ced414f2368edf81de8144c0bff8212f655e5419..8b85baf5be92efb7433a932576b28fc43c95f2be 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -162,7 +162,6 @@ enum hal_intf_ps_func {
 typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
 
 struct hal_ops {
-       void (*dm_init)(struct adapter *padapter);
        void (*dm_deinit)(struct adapter *padapter);
        void (*read_chip_version)(struct adapter *padapter);