From: Michael Straube Date: Tue, 15 Jul 2025 18:28:11 +0000 (+0200) Subject: staging: rtl8723bs: remove function pointer xmit_thread_handler X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f742f77d96fcd6dde4e34a2312e43d9caa9c253a;p=users%2Fjedix%2Flinux-maple.git staging: rtl8723bs: remove function pointer xmit_thread_handler Remove function pointer xmit_thread_handler and use rtl8723bs_xmit_buf_handler directly to reduce code complexity. Signed-off-by: Michael Straube Link: https://lore.kernel.org/r/20250715182814.212708-9-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c index d9791027a2f52..29e0610f72f1b 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -285,9 +285,7 @@ void beacon_timing_control(struct adapter *padapter) s32 rtw_hal_xmit_thread_handler(struct adapter *padapter) { - if (padapter->HalFunc.xmit_thread_handler) - return padapter->HalFunc.xmit_thread_handler(padapter); - return _FAIL; + return rtl8723bs_xmit_buf_handler(padapter); } void rtw_hal_notch_filter(struct adapter *adapter, bool enable) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index 11d9b90312150..c35b0235d3c11 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1315,8 +1315,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level) void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->xmit_thread_handler = &rtl8723bs_xmit_buf_handler; - pHalFunc->c2h_id_filter_ccx = c2h_id_filter_ccx_8723b; } diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h index 7b634180c6c0e..ce3c6de8a325a 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -161,7 +161,6 @@ enum hal_intf_ps_func { typedef s32 (*c2h_id_filter)(u8 *c2h_evt); struct hal_ops { - s32 (*xmit_thread_handler)(struct adapter *padapter); void (*hal_reset_security_engine)(struct adapter *adapter); c2h_id_filter c2h_id_filter_ccx; };