diff options
| author | Michael Straube <straube.linux@gmail.com> | 2025-07-15 20:28:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-07-16 09:38:44 +0200 |
| commit | c9517302a086b0682d44d5752b86e2526bd1c177 (patch) | |
| tree | 3341d6d3906e759a375360ca3fdb9353ad097311 /drivers/staging | |
| parent | 328463611a0c878c5e5f97082179958ca6085c92 (diff) | |
staging: rtl8723bs: remove function pointer c2h_handler
Remove function pointer c2h_handler and use c2h_handler_8723b directly
to reduce code complexity.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20250715182814.212708-5-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/rtl8723bs/hal/hal_intf.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/include/hal_intf.h | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c index a168852cb6c7..beb4272a0992 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -308,11 +308,7 @@ bool rtw_hal_c2h_valid(struct adapter *adapter, u8 *buf) s32 rtw_hal_c2h_handler(struct adapter *adapter, u8 *c2h_evt) { - s32 ret = _FAIL; - - if (adapter->HalFunc.c2h_handler) - ret = adapter->HalFunc.c2h_handler(adapter, c2h_evt); - return ret; + return c2h_handler_8723b(adapter, c2h_evt); } c2h_id_filter rtw_hal_c2h_id_filter_ccx(struct adapter *adapter) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index b746e3e05d16..10224d096886 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1317,7 +1317,6 @@ void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) { pHalFunc->xmit_thread_handler = &hal_xmit_handler; - pHalFunc->c2h_handler = c2h_handler_8723b; pHalFunc->c2h_id_filter_ccx = c2h_id_filter_ccx_8723b; pHalFunc->fill_h2c_cmd = &FillH2CCmd8723B; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h index 72ae4cdcf0dd..64f5d7b58258 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -163,7 +163,6 @@ 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); - s32 (*c2h_handler)(struct adapter *padapter, u8 *c2h_evt); c2h_id_filter c2h_id_filter_ccx; s32 (*fill_h2c_cmd)(struct adapter *, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer); |