Skip to content

Commit 8757b8d

Browse files
mistraubegregkh
authored andcommitted
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>
1 parent 206d5db commit 8757b8d

3 files changed

Lines changed: 1 addition & 10 deletions

File tree

drivers/staging/rtl8723bs/hal/hal_intf.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,5 @@ s32 rtw_hal_macid_wakeup(struct adapter *padapter, u32 macid)
346346

347347
s32 rtw_hal_fill_h2c_cmd(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer)
348348
{
349-
s32 ret = _FAIL;
350-
351-
if (padapter->HalFunc.fill_h2c_cmd)
352-
ret = padapter->HalFunc.fill_h2c_cmd(padapter, ElementID, CmdLen, pCmdBuffer);
353-
354-
return ret;
349+
return FillH2CCmd8723B(padapter, ElementID, CmdLen, pCmdBuffer);
355350
}

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,8 +1318,6 @@ void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc)
13181318
pHalFunc->xmit_thread_handler = &hal_xmit_handler;
13191319

13201320
pHalFunc->c2h_id_filter_ccx = c2h_id_filter_ccx_8723b;
1321-
1322-
pHalFunc->fill_h2c_cmd = &FillH2CCmd8723B;
13231321
}
13241322

13251323
void rtl8723b_InitAntenna_Selection(struct adapter *padapter)

drivers/staging/rtl8723bs/include/hal_intf.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ struct hal_ops {
164164
s32 (*xmit_thread_handler)(struct adapter *padapter);
165165
void (*hal_reset_security_engine)(struct adapter *adapter);
166166
c2h_id_filter c2h_id_filter_ccx;
167-
168-
s32 (*fill_h2c_cmd)(struct adapter *, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer);
169167
};
170168

171169
#define RF_CHANGE_BY_INIT 0

0 commit comments

Comments
 (0)