staging: r8188eu: remove UsbBulkOutSize from struct hal_data_8188e

UsbBulkOutSize in struct hal_data_8188e is only used to set a local
variable in rtl8188eu_xmitframe_complete(). Set the local variable
directly and remove UsbBulkOutSize from the hal_data_8188e structure.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220206144407.8397-1-straube.linux@gmail.com
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 94dafc7c1ad0b2e940078b6738eff3bb2afe3eab..205a392a0ad38a66206874b5666c4e581f5f1192 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
@@ -382,7 +382,7 @@ static u32 xmitframe_need_length(struct xmit_frame *pxmitframe)
 
 s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
 {
-       struct hal_data_8188e *haldata = &adapt->haldata;
+       struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(adapt);
        struct xmit_frame *pxmitframe = NULL;
        struct xmit_frame *pfirstframe = NULL;
 
@@ -396,13 +396,18 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp
        u32 pbuf_tail;  /*  last pkt tail */
        u32 len;        /*  packet length, except TXDESC_SIZE and PKT_OFFSET */
 
-       u32 bulksize = haldata->UsbBulkOutSize;
+       u32 bulksize;
        u8 desc_cnt;
        u32 bulkptr;
 
        /*  dump frame variable */
        u32 ff_hwaddr;
 
+       if (pdvobjpriv->ishighspeed)
+               bulksize = USB_HIGH_SPEED_BULK_SIZE;
+       else
+               bulksize = USB_FULL_SPEED_BULK_SIZE;
+
        /*  check xmitbuffer is ok */
        if (!pxmitbuf) {
                pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 0c0b7e819518b4ab98482430e571ea9f6e1aeaa7..3b3cb03d398906ecc7a85f79c1bfe285560b9465 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -45,13 +45,7 @@ static bool HalUsbSetQueuePipeMapping8188EUsb(struct adapter *adapt, u8 NumOutPi
 
 void rtl8188eu_interface_configure(struct adapter *adapt)
 {
-       struct hal_data_8188e *haldata = &adapt->haldata;
-       struct dvobj_priv       *pdvobjpriv = adapter_to_dvobj(adapt);
-
-       if (pdvobjpriv->ishighspeed)
-               haldata->UsbBulkOutSize = USB_HIGH_SPEED_BULK_SIZE;/* 512 bytes */
-       else
-               haldata->UsbBulkOutSize = USB_FULL_SPEED_BULK_SIZE;/* 64 bytes */
+       struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(adapt);
 
        HalUsbSetQueuePipeMapping8188EUsb(adapt, pdvobjpriv->RtNumOutPipes);
 }

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index c6472d13e069563f3a4b981646f86d408a102dfe..5b27bae97e9110e2be878cac484eff7ad3991918 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -171,8 +171,6 @@ struct hal_data_8188e {
        /*  Auto FSM to Turn On, include clock, isolation, power control
         *  for MAC only */
        u8      bMacPwrCtrlOn;
-
-       u32     UsbBulkOutSize;
 };
 
 s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy);