Remove function pointer hal_dm_watchdog and use rtl8723b_HalDmWatchDog
directly to increase readability.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +--
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 -
drivers/staging/rtl8723bs/include/hal_intf.h | 1 -
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 7aa9d84ee574..af72e0fe6fc0 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -285,8 +285,7 @@ void rtw_hal_set_chnl_bw(struct adapter *padapter, u8 channel,
void rtw_hal_dm_watchdog(struct adapter *padapter)
{
- if (padapter->HalFunc.hal_dm_watchdog)
- padapter->HalFunc.hal_dm_watchdog(padapter);
+ rtl8723b_HalDmWatchDog(padapter);
}
void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index f742a82d1e35..ff899a066b33 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1744,7 +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 = &rtl8723b_HalDmWatchDog;
pHalFunc->hal_dm_watchdog_in_lps = &rtl8723b_HalDmWatchDog_in_LPS;
diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index ddc4c41605d2..311a97c31518 100644
--- 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 (*hal_dm_watchdog)(struct adapter *padapter);
void (*hal_dm_watchdog_in_lps)(struct adapter *padapter);
void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
--
2.43.0
