staging: r8188eu: remove UsbTxAggDescNum from struct hal_data_8188e

UsbTxAggDescNum in struct hal_data_8188e is set to 0x6 and never
changed. Define this constant and remove UsbTxAggDescNum from the
hal_data_8188e structure.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220201084259.7497-6-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 293541db597d00d01a5ca482e2423527d15158ad..94dafc7c1ad0b2e940078b6738eff3bb2afe3eab 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c
@@ -518,7 +518,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp
 
                if (pbuf < bulkptr) {
                        desc_cnt++;
-                       if (desc_cnt == haldata->UsbTxAggDescNum)
+                       if (desc_cnt == USB_TXAGG_DESC_NUM)
                                break;
                } else {
                        desc_cnt = 0;

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index e6c253122e9c019101564f324170f2d8cab83199..f33586a740af854ffa75f5fe594c185e35964721 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -54,7 +54,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt)
                haldata->UsbBulkOutSize = USB_FULL_SPEED_BULK_SIZE;/* 64 bytes */
 
        haldata->UsbTxAggMode           = 1;
-       haldata->UsbTxAggDescNum        = 0x6;  /*  only 4 bits */
 
        haldata->UsbRxAggMode           = USB_RX_AGG_DMA;/*  USB_RX_AGG_DMA; */
        haldata->UsbRxAggBlockCount     = 8; /* unit : 512b */
@@ -416,7 +415,7 @@ static void usb_AggSettingTxUpdate(struct adapter *Adapter)
        if (haldata->UsbTxAggMode) {
                value32 = rtw_read32(Adapter, REG_TDECTRL);
                value32 = value32 & ~(BLK_DESC_NUM_MASK << BLK_DESC_NUM_SHIFT);
-               value32 |= ((haldata->UsbTxAggDescNum & 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);
        }

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 7a72b564400d8421d5ebfe4dce1ac9eca979224d..9f4d42c1d24e4f04202256a882c97c12077ebb9f 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -214,7 +214,6 @@ struct hal_data_8188e {
        u32     UsbBulkOutSize;
 
        u8      UsbTxAggMode;
-       u8      UsbTxAggDescNum;
 
        enum usb_rx_agg_mode UsbRxAggMode;
        u8      UsbRxAggBlockCount;     /*  USB Block count. Block size is

diff --git a/drivers/staging/r8188eu/include/rtl8188e_xmit.h b/drivers/staging/r8188eu/include/rtl8188e_xmit.h
index f1f2ccfc765ea4618dbc52ca10d8e70909a7bab8..85eb0aad80d642493715e2a53f94f07858424e0d 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_xmit.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_xmit.h
@@ -93,6 +93,8 @@ enum TXDESC_SC {
 #define SGI                    BIT(6)
 #define USB_TXAGG_NUM_SHT      24
 
+#define USB_TXAGG_DESC_NUM     0x6
+
 #define txdesc_set_ccx_sw_88e(txdesc, value) \
        do { \
                ((struct txdesc_88e *)(txdesc))->sw1 = (((value)>>8) & 0x0f); \