From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 3/9] staging: r8188eu: remove ReceiveConfig from struct hal_data_8188e
Date: Tue, 1 Feb 2022 09:42:53 +0100 [thread overview]
Message-ID: <20220201084259.7497-4-straube.linux@gmail.com> (raw)
In-Reply-To: <20220201084259.7497-1-straube.linux@gmail.com>
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>
---
drivers/staging/r8188eu/hal/usb_halinit.c | 12 +++++-------
drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 -
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 91b854c7b9a1..2252e8a1d55b 100644
--- 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 661c447a0453..88246ef65f8a 100644
--- 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 */
--
2.34.1
next prev parent reply other threads:[~2022-02-01 8:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-01 8:42 [PATCH 0/9] staging: r8188eu: hal_data_8188e cleanups Michael Straube
2022-02-01 8:42 ` [PATCH 1/9] staging: r8188eu: ExternalPA is read-only Michael Straube
2022-02-01 8:42 ` [PATCH 2/9] staging: r8188eu: remove PGMaxGroup from struct hal_data_8188e Michael Straube
2022-02-01 8:42 ` Michael Straube [this message]
2022-02-01 8:42 ` [PATCH 4/9] staging: r8188eu: BasicRateSet is set but never used Michael Straube
2022-02-01 8:42 ` [PATCH 5/9] staging: r8188eu: remove UsbTxAggDescNum from struct hal_data_8188e Michael Straube
2022-02-01 8:42 ` [PATCH 6/9] staging: r8188eu: remove UsbTxAggMode " Michael Straube
2022-02-01 8:42 ` [PATCH 7/9] staging: r8188eu: remove UsbRxAggMode " Michael Straube
2022-02-01 8:42 ` [PATCH 8/9] staging: r8188eu: remove UsbRxAggBlock* " Michael Straube
2022-02-01 8:42 ` [PATCH 9/9] staging: r8188eu: remove UsbRxAggPage* " Michael Straube
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220201084259.7497-4-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).