staging: r8188eu: remove unused parameter

All callers of rtl8188eu_xmitframe_complete set the pxmitbuf parameter to
NULL, in which case rtl8188eu_xmitframe_complete allocates another
xmit_buf internally.

Remove the pxmitbuf parameter and resulting dead code.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20221230180646.91008-6-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
index 6d1f56d1f9d72a9539d848e6a5d3816b642213fd..cca74cf289150556042cd5f26aacd65fca1b9ccd 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
@@ -375,11 +375,12 @@ static u32 xmitframe_need_length(struct xmit_frame *pxmitframe)
        return len;
 }
 
-bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
+bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitpriv)
 {
        struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(adapt);
        struct xmit_frame *pxmitframe = NULL;
        struct xmit_frame *pfirstframe = NULL;
+       struct xmit_buf *pxmitbuf;
 
        /*  aggregate variable */
        struct hw_xmit *phwxmit;
@@ -403,12 +404,9 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmit
        else
                bulksize = USB_FULL_SPEED_BULK_SIZE;
 
-       /*  check xmitbuffer is ok */
-       if (!pxmitbuf) {
-               pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
-               if (!pxmitbuf)
-                       return false;
-       }
+       pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
+       if (!pxmitbuf)
+               return false;
 
        /* 3 1. pick up first frame */
        rtw_free_xmitframe(pxmitpriv, pxmitframe);

diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index 7c72f5e04d9ba519693d52aee05d13ce66c570d2..c51f860d35278a485bc78b3750a30aca43ee4e0b 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -494,7 +494,7 @@ void rtl8188eu_xmit_tasklet(unsigned long priv)
                    (adapt->bWritePortCancel))
                        break;
 
-               ret = rtl8188eu_xmitframe_complete(adapt, pxmitpriv, NULL);
+               ret = rtl8188eu_xmitframe_complete(adapt, pxmitpriv);
 
                if (!ret)
                        break;

diff --git a/drivers/staging/r8188eu/include/rtl8188e_xmit.h b/drivers/staging/r8188eu/include/rtl8188e_xmit.h
index 6db7fabebea92bae85d8c60c55cee12eeb9b2687..865468d6b9222d00971c2bdaa159d53cc1d68c04 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_xmit.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_xmit.h
@@ -138,7 +138,6 @@ s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter);
 #define hal_xmit_handler rtl8188eu_xmit_buf_handler
 void rtl8188eu_xmit_tasklet(unsigned long priv);
 bool rtl8188eu_xmitframe_complete(struct adapter *padapter,
-                                struct xmit_priv *pxmitpriv,
-                                struct xmit_buf *pxmitbuf);
+                                struct xmit_priv *pxmitpriv);
 
 #endif /* __RTL8188E_XMIT_H__ */