staging: rtl8723bs: Remove function pointer hal_xmitframe_enqueue

Remove function pointer hal_xmitframe_enqueue and use
rtl8723bs_hal_xmitframe_enqueue directly to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/aef8fb63ed9944dde468fe1a69e5a9c700a4f627.1730619982.git.philipp.g.hortmann@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 7462b10fdc9434cc38a1949ff7ef99a0a0b5231e..8b924961789e5134576f4e1a22b2204cff9bc408 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -154,10 +154,7 @@ u8 rtw_hal_check_ips_status(struct adapter *padapter)
 
 s32    rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmitframe)
 {
-       if (padapter->HalFunc.hal_xmitframe_enqueue)
-               return padapter->HalFunc.hal_xmitframe_enqueue(padapter, pxmitframe);
-
-       return false;
+       return rtl8723bs_hal_xmitframe_enqueue(padapter, pxmitframe);
 }
 
 s32    rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe)

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 20dbaa995498e6f88a9da7793d7c041bb1c2601c..af9a2b068796a74d9e328da8322a875b6cbbc366 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -1258,5 +1258,4 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)
 
        rtl8723b_set_hal_ops(pHalFunc);
 
-       pHalFunc->hal_xmitframe_enqueue = &rtl8723bs_hal_xmitframe_enqueue;
 }

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 697e22d1e535b462b24a66dbbb68db74f57410fd..7050520224ffdd0a928e2726aa9962943f2f2d35 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -180,8 +180,6 @@ struct hal_ops {
        void (*run_thread)(struct adapter *padapter);
        void (*cancel_thread)(struct adapter *padapter);
 
-       s32     (*hal_xmitframe_enqueue)(struct adapter *padapter, struct xmit_frame *pxmitframe);
-
        u32 (*read_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask);
        void (*write_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data);
        u32 (*read_rfreg)(struct adapter *padapter, u8 eRFPath, u32 RegAddr, u32 BitMask);