staging: rtl8723bs: Remove function pointer hal_dm_watchdog_in_lps

Remove function pointer hal_dm_watchdog_in_lps and use
rtl8723b_HalDmWatchDog_in_LPS directly to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/313978b8c0f331200c1a8dc3382b01088930c0e8.1730749680.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 af72e0fe6fc0860a820135ba5de5c6aa01f817ef..f3666b26ffe15b08ba7bf22b85bd1da5a69249c7 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -291,8 +291,7 @@ void rtw_hal_dm_watchdog(struct adapter *padapter)
 void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter)
 {
        if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode) {
-               if (padapter->HalFunc.hal_dm_watchdog_in_lps)
-                       padapter->HalFunc.hal_dm_watchdog_in_lps(padapter); /* this function caller is in interrupt context */
+               rtl8723b_HalDmWatchDog_in_LPS(padapter); /* this function caller is in interrupt context */
        }
 }
 

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index ff899a066b33543fae04621d8bf92ccb75fe57bf..844ef4a80ad0602caf0a01299457b61979e5e0b1 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1744,9 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)
 
 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
 {
-       pHalFunc->hal_dm_watchdog_in_lps = &rtl8723b_HalDmWatchDog_in_LPS;
-
-
        pHalFunc->SetBeaconRelatedRegistersHandler = &rtl8723b_SetBeaconRelatedRegisters;
 
        pHalFunc->Add_RateATid = &rtl8723b_Add_RateATid;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 311a97c315185abea7c87c376c1cd29c63184b61..1e2bed9ebeeff9ee8e76b449af9f6e43e20c31ce 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 (*hal_dm_watchdog_in_lps)(struct adapter *padapter);
-
        void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
 
        void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter);