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: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220201084259.7497-4-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 91b854c7b9a14c23fb21a3f284e8bedb6b12237b..2252e8a1d55b308e9b756bb0bdaef7802b30ade3 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -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 |
-                                 RCR_CBSSID_DATA | RCR_CBSSID_BCN |
-                                 RCR_APP_ICV | RCR_AMF | RCR_HTC_LOC_CTRL |
-                                 RCR_APP_MIC | RCR_APP_PHYSTS;
+       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);

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 661c447a04537cb678050065785ad1b1c16767d5..88246ef65f8aab49540df905e4117b5e7db1a31e 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -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 */