OSDN Git Service

staging: r8188eu: remove rtw_hal_xmitframe_enqueue function
authorPhillip Potter <phil@philpotter.co.uk>
Mon, 6 Sep 2021 01:01:01 +0000 (02:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Sep 2021 06:49:49 +0000 (08:49 +0200)
Remove rtw_hal_xmitframe_enqueue from hal/hal_intf.c and its one
caller from core/rtw_recv.c, and remove its declaration from
include/hal_intf.h as well. This is just a wrapper function that calls
the function pointer hal_xmitframe_enqueue in struct hal_ops if it
is set, which it never is.

Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210906010106.898-10-phil@philpotter.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_recv.c
drivers/staging/r8188eu/hal/hal_intf.c
drivers/staging/r8188eu/include/hal_intf.h

index 019c536..ba69cf9 100644 (file)
@@ -966,8 +966,6 @@ static int validate_recv_ctrl_frame(struct adapter *padapter,
 
                                pxmitframe->attrib.triggered = 1;
 
-                               rtw_hal_xmitframe_enqueue(padapter, pxmitframe);
-
                                if (psta->sleepq_len == 0) {
                                        pstapriv->tim_bitmap &= ~BIT(psta->aid);
 
index 75717db..52edec7 100644 (file)
@@ -144,14 +144,6 @@ u8 rtw_hal_intf_ps_func(struct adapter *adapt,
        return _FAIL;
 }
 
-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;
-}
-
 s32 rtw_hal_xmit(struct adapter *adapt, struct xmit_frame *pxmitframe)
 {
        if (adapt->HalFunc.hal_xmit)
index dc9f052..6e5ee5a 100644 (file)
@@ -285,8 +285,6 @@ u32 rtw_hal_inirp_deinit(struct adapter *padapter);
 
 u8     rtw_hal_intf_ps_func(struct adapter *padapter,
                             enum hal_intf_ps_func efunc_id, u8 *val);
-s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter,
-                             struct xmit_frame *pxmitframe);
 
 s32    rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);
 s32    rtw_hal_mgnt_xmit(struct adapter *padapter,