staging: r8188eu: remove UsbRxAggPage* from struct hal_data_8188e

UsbRxAggPageCount and UsbRxAggPageTimeout in struct hal_data_8188e
are set and never changed. Define these constants and remove the
variables from the hal_data_8188e structure.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220201084259.7497-10-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 1d0d58204c688a443d18a9a0a48928ea83b1dac6..f21b910bd88d33e0e7c9d3376cdcd9825848b06d 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -53,9 +53,6 @@ void rtl8188eu_interface_configure(struct adapter *adapt)
        else
                haldata->UsbBulkOutSize = USB_FULL_SPEED_BULK_SIZE;/* 64 bytes */
 
-       haldata->UsbRxAggPageCount      = 48; /* uint :128 b 0x0A;      10 = MAX_RX_DMA_BUFFER_SIZE/2/haldata->UsbBulkOutSize */
-       haldata->UsbRxAggPageTimeout    = 0x4; /* 6, absolute time = 34ms/(2^6) */
-
        HalUsbSetQueuePipeMapping8188EUsb(adapt, pdvobjpriv->RtNumOutPipes);
 }
 
@@ -433,7 +430,6 @@ usb_AggSettingRxUpdate(
                struct adapter *Adapter
        )
 {
-       struct hal_data_8188e *haldata = &Adapter->haldata;
        u8 valueDMA;
        u8 valueUSB;
 
@@ -446,8 +442,8 @@ usb_AggSettingRxUpdate(
        rtw_write8(Adapter, REG_TRXDMA_CTRL, valueDMA);
        rtw_write8(Adapter, REG_USB_SPECIAL_OPTION, valueUSB);
 
-       rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, haldata->UsbRxAggPageCount);
-       rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH + 1, haldata->UsbRxAggPageTimeout);
+       rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, USB_RXAGG_PAGE_COUNT);
+       rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH + 1, USB_RXAGG_PAGE_TIMEOUT);
 }
 
 static void InitUsbAggregationSetting(struct adapter *Adapter)
@@ -1314,7 +1310,7 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
                {
                        u8 threshold = *((u8 *)val);
                        if (threshold == 0)
-                               threshold = haldata->UsbRxAggPageCount;
+                               threshold = USB_RXAGG_PAGE_COUNT;
                        rtw_write8(Adapter, REG_RXDMA_AGG_PG_TH, threshold);
                }
                break;

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 94678dad37ce2167fb122b17f5a6a8f891c85a3a..e3c028ff20c7c97d31fd9e407ab819408454e149 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -141,6 +141,9 @@ struct txpowerinfo24g {
 
 #define EFUSE_PROTECT_BYTES_BANK       16
 
+#define USB_RXAGG_PAGE_COUNT   48
+#define USB_RXAGG_PAGE_TIMEOUT 0x4
+
 struct hal_data_8188e {
        struct HAL_VERSION      VersionID;
        /* current WIFI_PHY values */
@@ -205,9 +208,6 @@ struct hal_data_8188e {
        u8      bMacPwrCtrlOn;
 
        u32     UsbBulkOutSize;
-
-       u8      UsbRxAggPageCount;      /*  8192C DMA page count */
-       u8      UsbRxAggPageTimeout;
 };
 
 s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy);