staging: r8188eu: remove UsbTxAggMode from struct hal_data_8188e

UsbTxAggMode in struct hal_data_r8188e is only used in a single if
statement. Remove UsbTxAggMode from the hal_data_8188e structure and
adjust the if statement.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220201084259.7497-7-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index f33586a740af854ffa75f5fe594c185e35964721..1c40d5065f516ce20fdcdd0dca06ef29f15c4110 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -53,8 +53,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt)
        else
                haldata->UsbBulkOutSize = USB_FULL_SPEED_BULK_SIZE;/* 64 bytes */
 
-       haldata->UsbTxAggMode           = 1;
-
        haldata->UsbRxAggMode           = USB_RX_AGG_DMA;/*  USB_RX_AGG_DMA; */
        haldata->UsbRxAggBlockCount     = 8; /* unit : 512b */
        haldata->UsbRxAggBlockTimeout   = 0x6;
@@ -406,20 +404,17 @@ static void _InitRetryFunction(struct adapter *Adapter)
  *---------------------------------------------------------------------------*/
 static void usb_AggSettingTxUpdate(struct adapter *Adapter)
 {
-       struct hal_data_8188e *haldata = &Adapter->haldata;
        u32 value32;
 
        if (Adapter->registrypriv.wifi_spec)
-               haldata->UsbTxAggMode = false;
+               return;
 
-       if (haldata->UsbTxAggMode) {
-               value32 = rtw_read32(Adapter, REG_TDECTRL);
-               value32 = value32 & ~(BLK_DESC_NUM_MASK << BLK_DESC_NUM_SHIFT);
-               value32 |= ((USB_TXAGG_DESC_NUM & BLK_DESC_NUM_MASK) << BLK_DESC_NUM_SHIFT);
+       value32 = rtw_read32(Adapter, REG_TDECTRL);
+       value32 = value32 & ~(BLK_DESC_NUM_MASK << BLK_DESC_NUM_SHIFT);
+       value32 |= ((USB_TXAGG_DESC_NUM & BLK_DESC_NUM_MASK) << BLK_DESC_NUM_SHIFT);
 
-               rtw_write32(Adapter, REG_TDECTRL, value32);
-       }
-}      /*  usb_AggSettingTxUpdate */
+       rtw_write32(Adapter, REG_TDECTRL, value32);
+}
 
 /*-----------------------------------------------------------------------------
  * Function:   usb_AggSettingRxUpdate()

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 9f4d42c1d24e4f04202256a882c97c12077ebb9f..5dce718c086595b3c2fffa4ed535f6ce6a667ab3 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -213,8 +213,6 @@ struct hal_data_8188e {
 
        u32     UsbBulkOutSize;
 
-       u8      UsbTxAggMode;
-
        enum usb_rx_agg_mode UsbRxAggMode;
        u8      UsbRxAggBlockCount;     /*  USB Block count. Block size is
                                         * 512-byte in high speed and 64-byte