staging: rtl8723bs: Remove function pointer cancel_thread

Remove function pointer cancel_thread and use rtl8723b_stop_thread
directly to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/e4fdff174a8ddc6cd62232e0aac8e23f4f34b1b9.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 28d15536abbb736291204b13619effc895af21cd..22c41e4deae43330c0a0bd7afc0bdcaa0dae81c6 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -238,8 +238,7 @@ void rtw_hal_start_thread(struct adapter *padapter)
 /*Start specifical interface thread            */
 void rtw_hal_stop_thread(struct adapter *padapter)
 {
-       if (padapter->HalFunc.cancel_thread)
-               padapter->HalFunc.cancel_thread(padapter);
+       rtl8723b_stop_thread(padapter);
 }
 
 u32 rtw_hal_read_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 8d8270d85f960cb2d209bd168396aaee74ec3f6e..d23e4b1c36b60da443f86cec3b153ee6873cb76f 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)
 
 void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
 {
-       pHalFunc->cancel_thread = &rtl8723b_stop_thread;
-
        pHalFunc->read_bbreg = &PHY_QueryBBReg_8723B;
        pHalFunc->write_bbreg = &PHY_SetBBReg_8723B;
        pHalFunc->read_rfreg = &PHY_QueryRFReg_8723B;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 3306c26ed2a4aae84d53308d872507f264634c7e..02b31c142b9aeba3155333b37e1c604766f6ba26 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -164,8 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
 struct hal_ops {
        void (*SetHalODMVarHandler)(struct adapter *padapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet);
 
-       void (*cancel_thread)(struct adapter *padapter);
-
        u32 (*read_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask);
        void (*write_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data);
        u32 (*read_rfreg)(struct adapter *padapter, u8 eRFPath, u32 RegAddr, u32 BitMask);