Commit 0da70274 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

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: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220201084259.7497-7-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b57774cc

drivers/staging/r8188eu/hal/usb_halinit.c

+6 −11
Original line number Diff line number Diff line
@@ -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);



	rtw_write32(Adapter, REG_TDECTRL, value32);

}

}	/*  usb_AggSettingTxUpdate */



/*-----------------------------------------------------------------------------

 * Function:	usb_AggSettingRxUpdate()

drivers/staging/r8188eu/include/rtl8188e_hal.h

+0 −2
Original line number Diff line number Diff line
@@ -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