From: Michael Straube Date: Tue, 15 Jul 2025 18:28:13 +0000 (+0200) Subject: staging: rtl8723bs: remove function pointer c2h_id_filter X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86dcc99669e253dd68838a5ff24fac1c11913a8d;p=thirdparty%2Flinux.git staging: rtl8723bs: remove function pointer c2h_id_filter Remove function pointer c2h_id_filter from struct hal_ops and use c2h_id_filter_ccx_8723b directly to reduce code complexity. Signed-off-by: Michael Straube Link: https://lore.kernel.org/r/20250715182814.212708-11-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 dea38bb8424d7..961b0563951d2 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -303,7 +303,7 @@ s32 rtw_hal_c2h_handler(struct adapter *adapter, u8 *c2h_evt) c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter) { - return adapter->HalFunc.c2h_id_filter_ccx; + return c2h_id_filter_ccx_8723b; } s32 rtw_hal_macid_sleep(struct adapter *padapter, u32 macid) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index c35b0235d3c11..1e9447633465a 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1315,7 +1315,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level) void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { - pHalFunc->c2h_id_filter_ccx = c2h_id_filter_ccx_8723b; } void rtl8723b_InitAntenna_Selection(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h index d6fd692aedc8b..248f54f04c5ef 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 { - c2h_id_filter c2h_id_filter_ccx; }; #define RF_CHANGE_BY_INIT 0