staging: rtl8723bs: remove function pointer fill_h2c_cmd

Remove function pointer fill_h2c_cmd and use FillH2CCmd8723B directly
to reduce code complexity.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20250715182814.212708-7-straube.linux@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 beb4272a0992623f9e832002253c095a744ece5b..d9791027a2f52dceaac67f31a0cc7946a592c50d 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -346,10 +346,5 @@ s32 rtw_hal_macid_wakeup(struct adapter *padapter, u32 macid)
 
 s32 rtw_hal_fill_h2c_cmd(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer)
 {
-       s32 ret = _FAIL;
-
-       if (padapter->HalFunc.fill_h2c_cmd)
-               ret = padapter->HalFunc.fill_h2c_cmd(padapter, ElementID, CmdLen, pCmdBuffer);
-
-       return ret;
+       return FillH2CCmd8723B(padapter, ElementID, CmdLen, pCmdBuffer);
 }

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 10224d09688655c8032239761b3c3cd3ed091b33..c6fda239d020e26fc28f7ac965e666f6fd0da9a2 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -1318,8 +1318,6 @@ void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->xmit_thread_handler = &hal_xmit_handler;
 
        pHalFunc->c2h_id_filter_ccx = c2h_id_filter_ccx_8723b;
-
-       pHalFunc->fill_h2c_cmd = &FillH2CCmd8723B;
 }
 
 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 64f5d7b582583aeb6fe880d2c4395f6df8e1ef7f..7b634180c6c0e6d66eadd72a5fe157ed8ee417d1 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -164,8 +164,6 @@ 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;
-
-       s32 (*fill_h2c_cmd)(struct adapter *, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer);
 };
 
 #define RF_CHANGE_BY_INIT      0