staging: rtl8723bs: Remove function pointer hal_xmit

Remove function pointer hal_xmit and use rtl8723bs_hal_xmit directly to
increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/db4f4a699847209e4a577ebfbea82b87c571e6d1.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 d45dfa8e638ea4d53ebcafb938b12d82e7906d45..914d4b24d49d6338351de62936354e0d8dddb5cc 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -162,10 +162,7 @@ s32        rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmit
 
 s32    rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe)
 {
-       if (padapter->HalFunc.hal_xmit)
-               return padapter->HalFunc.hal_xmit(padapter, pxmitframe);
-
-       return false;
+       return rtl8723bs_hal_xmit(padapter, pxmitframe);
 }
 
 /*

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index ccf1e972784604cca814e9f02526ef3c1e03abd0..563ebf8e7fdb7832ada4ba7648c056276ce8e770 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -1258,7 +1258,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)
 
        rtl8723b_set_hal_ops(pHalFunc);
 
-       pHalFunc->hal_xmit = &rtl8723bs_hal_xmit;
        pHalFunc->mgnt_xmit = &rtl8723bs_mgnt_xmit;
        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 b69d201b6826cd73029b5931051f5d721b68b331..dfb973018e4e0c4782a0132f1356e2141d287a5a 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -180,7 +180,6 @@ struct hal_ops {
        void (*run_thread)(struct adapter *padapter);
        void (*cancel_thread)(struct adapter *padapter);
 
-       s32     (*hal_xmit)(struct adapter *padapter, struct xmit_frame *pxmitframe);
        /*
         * mgnt_xmit should be implemented to run in interrupt context
         */