staging: rtl8723bs: Remove function pointer mgnt_xmit

Remove function pointer mgnt_xmit and use rtl8723bs_mgnt_xmit directly to
increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/59988d60701a6f83a6a83b6c813e58c4484c7d3e.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 914d4b24d49d6338351de62936354e0d8dddb5cc..7462b10fdc9434cc38a1949ff7ef99a0a0b5231e 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -170,8 +170,6 @@ s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe)
  */
 s32    rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe)
 {
-       s32 ret = _FAIL;
-
        update_mgntframe_attrib_addr(padapter, pmgntframe);
        /* pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; */
        /* pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; */
@@ -188,9 +186,7 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe)
                rtw_mgmt_xmitframe_coalesce(padapter, pmgntframe->pkt, pmgntframe);
        }
 
-       if (padapter->HalFunc.mgnt_xmit)
-               ret = padapter->HalFunc.mgnt_xmit(padapter, pmgntframe);
-       return ret;
+       return rtl8723bs_mgnt_xmit(padapter, pmgntframe);
 }
 
 s32    rtw_hal_init_xmit_priv(struct adapter *padapter)

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 563ebf8e7fdb7832ada4ba7648c056276ce8e770..20dbaa995498e6f88a9da7793d7c041bb1c2601c 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -1258,6 +1258,5 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)
 
        rtl8723b_set_hal_ops(pHalFunc);
 
-       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 dfb973018e4e0c4782a0132f1356e2141d287a5a..697e22d1e535b462b24a66dbbb68db74f57410fd 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -180,10 +180,6 @@ struct hal_ops {
        void (*run_thread)(struct adapter *padapter);
        void (*cancel_thread)(struct adapter *padapter);
 
-       /*
-        * mgnt_xmit should be implemented to run in interrupt context
-        */
-       s32 (*mgnt_xmit)(struct adapter *padapter, struct xmit_frame *pmgntframe);
        s32     (*hal_xmitframe_enqueue)(struct adapter *padapter, struct xmit_frame *pxmitframe);
 
        u32 (*read_bbreg)(struct adapter *padapter, u32 RegAddr, u32 BitMask);