Commit 513750ab authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove ReceiveConfig from struct hal_data_8188e 



The ReceiveConfig variable in struct hal_data_8188e is only used
to store a local value. Use a local variable instead and remove
ReceiveConfig from struct hal_data_8188e.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220201084259.7497-4-straube.linux@gmail.com


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

drivers/staging/r8188eu/hal/usb_halinit.c

+5 −7
Original line number Diff line number Diff line
@@ -324,15 +324,13 @@ static void _InitDriverInfoSize(struct adapter *Adapter, u8 drvInfoSize) 


static void _InitWMACSetting(struct adapter *Adapter)

{

	struct hal_data_8188e *haldata = &Adapter->haldata;



	haldata->ReceiveConfig = RCR_AAP | RCR_APM | RCR_AM | RCR_AB |

	u32 receive_config = RCR_AAP | RCR_APM | RCR_AM | RCR_AB |

			     RCR_CBSSID_DATA | RCR_CBSSID_BCN |

			     RCR_APP_ICV | RCR_AMF | RCR_HTC_LOC_CTRL |

			     RCR_APP_MIC | RCR_APP_PHYSTS;



	/*  some REG_RCR will be modified later by phy_ConfigMACWithHeaderFile() */

	rtw_write32(Adapter, REG_RCR, haldata->ReceiveConfig);

	rtw_write32(Adapter, REG_RCR, receive_config);



	/*  Accept all multicast address */

	rtw_write32(Adapter, REG_MAR, 0xFFFFFFFF);

drivers/staging/r8188eu/include/rtl8188e_hal.h

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ struct txpowerinfo24g { 
struct hal_data_8188e {

	struct HAL_VERSION	VersionID;

	/* current WIFI_PHY values */

	u32	ReceiveConfig;

	enum ht_channel_width CurrentChannelBW;

	u8	CurrentChannel;

	u8	nCur40MhzPrimeSC;/*  Control channel sub-carrier */