r8188eu: remove unused urbs from struct xmit_buf

Driver allocates eighth urbs per xmit_buf, but uses only first urb.
Allocation of seven remaining urbs wastes memory for nothing.

Reviewed-by: Pavel Skripkin <paskripkin@gmail.com>
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20220417163608.42917-1-insafonov@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h
index b2df1480d66b39c5b2023631be4acb5ba5d9b1ae..54c2bdf68acc817e398d375dc67aeceb09c9c457 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_xmit.h
+++ b/drivers/staging/r8188eu/include/rtw_xmit.h
@@ -198,7 +198,7 @@ struct xmit_buf {
        u32  len;
        struct submit_ctx *sctx;
        u32     ff_hwaddr;
-       struct urb *pxmit_urb[8];
+       struct urb *pxmit_urb;
        dma_addr_t dma_transfer_addr;   /* (in) dma addr for transfer_buffer */
        u8 bpending[8];
        int last[8];

diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
index 8ca16861bfcc75d896689712f5c951967cb522a2..0269e602b217b5c9a899497349a01316d94fc6ca 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
@@ -140,7 +140,7 @@ u32 rtw_write_port(struct adapter *padapter, u32 addr, u32 cnt, u8 *wmem)
 
        spin_unlock_irqrestore(&pxmitpriv->lock, irqL);
 
-       purb    = pxmitbuf->pxmit_urb[0];
+       purb    = pxmitbuf->pxmit_urb;
 
        /* translate DMA FIFO addr to pipehandle */
        pipe = ffaddr2pipehdl(pdvobj, addr);
@@ -178,25 +178,21 @@ exit:
 
 void rtw_write_port_cancel(struct adapter *padapter)
 {
-       int i, j;
+       int i;
        struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf;
 
        padapter->bWritePortCancel = true;
 
        for (i = 0; i < NR_XMITBUFF; i++) {
-               for (j = 0; j < 8; j++) {
-                       if (pxmitbuf->pxmit_urb[j])
-                               usb_kill_urb(pxmitbuf->pxmit_urb[j]);
-               }
+               if (pxmitbuf->pxmit_urb)
+                       usb_kill_urb(pxmitbuf->pxmit_urb);
                pxmitbuf++;
        }
 
        pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmit_extbuf;
        for (i = 0; i < NR_XMIT_EXTBUFF; i++) {
-               for (j = 0; j < 8; j++) {
-                       if (pxmitbuf->pxmit_urb[j])
-                               usb_kill_urb(pxmitbuf->pxmit_urb[j]);
-               }
+               if (pxmitbuf->pxmit_urb)
+                       usb_kill_urb(pxmitbuf->pxmit_urb);
                pxmitbuf++;
        }
 }

diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/r8188eu/os_dep/xmit_linux.c
index a6012cffd37e13aafe0869388bc428e9671a4f61..e430c64e9068641de87e1ea45e15d82f9fc44403 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/xmit_linux.c
+++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c
@@ -67,8 +67,6 @@ bool rtw_endofpktfile(struct pkt_file *pfile)
 
 int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 alloc_sz)
 {
-       int i;
-
        pxmitbuf->pallocated_buf = kzalloc(alloc_sz, GFP_KERNEL);
        if (!pxmitbuf->pallocated_buf)
                return _FAIL;
@@ -76,21 +74,17 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb
        pxmitbuf->pbuf = (u8 *)N_BYTE_ALIGMENT((size_t)(pxmitbuf->pallocated_buf), XMITBUF_ALIGN_SZ);
        pxmitbuf->dma_transfer_addr = 0;
 
-       for (i = 0; i < 8; i++) {
-               pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
-               if (!pxmitbuf->pxmit_urb[i])
-                       return _FAIL;
-       }
+       pxmitbuf->pxmit_urb = usb_alloc_urb(0, GFP_KERNEL);
+       if (!pxmitbuf->pxmit_urb)
+               return _FAIL;
+
        return _SUCCESS;
 }
 
 void rtw_os_xmit_resource_free(struct adapter *padapter,
                               struct xmit_buf *pxmitbuf, u32 free_sz)
 {
-       int i;
-
-       for (i = 0; i < 8; i++)
-               usb_free_urb(pxmitbuf->pxmit_urb[i]);
+       usb_free_urb(pxmitbuf->pxmit_urb);
 
        kfree(pxmitbuf->pallocated_buf);
 }