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 v2 3/5] staging: r8188eu: remove enum odm_bw
Date: Mon, 21 Feb 2022 08:33:04 +0100 [thread overview]
Message-ID: <20220221073306.16636-4-straube.linux@gmail.com> (raw)
In-Reply-To: <20220221073306.16636-1-straube.linux@gmail.com>
The enums odm_bw and ht_channel_width are redundant. Keep
ht_channel_width and remove odm_bw.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
v2:
no changes
drivers/staging/r8188eu/hal/odm.c | 4 ++--
drivers/staging/r8188eu/include/odm.h | 6 ------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 6f594ae33c6e..5d2f934d78ae 100644
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -266,7 +266,7 @@ static void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm)
u8 i;
struct sta_info *pEntry;
- if (*pDM_Odm->pBandWidth == ODM_BW40M) {
+ if (*pDM_Odm->pBandWidth == HT_CHANNEL_WIDTH_40) {
if (*pDM_Odm->pSecChOffset == 1)
pDM_Odm->ControlChannel = *pDM_Odm->pChannel - 2;
else if (*pDM_Odm->pSecChOffset == 2)
@@ -766,7 +766,7 @@ u32 ODM_Get_Rate_Bitmap(struct odm_dm_struct *pDM_Odm, u32 macid, u32 ra_mask, u
} else if (rssi_level == DM_RATR_STA_MIDDLE) {
rate_bitmap = 0x000ff000;
} else {
- if (*pDM_Odm->pBandWidth == ODM_BW40M)
+ if (*pDM_Odm->pBandWidth == HT_CHANNEL_WIDTH_40)
rate_bitmap = 0x000ff015;
else
rate_bitmap = 0x000ff005;
diff --git a/drivers/staging/r8188eu/include/odm.h b/drivers/staging/r8188eu/include/odm.h
index 0e85bd88ab8a..fed12203c558 100644
--- a/drivers/staging/r8188eu/include/odm.h
+++ b/drivers/staging/r8188eu/include/odm.h
@@ -166,12 +166,6 @@ enum odm_wireless_mode {
ODM_WM_AUTO = BIT(5),
};
-/* ODM_CMNINFO_BW */
-enum odm_bw {
- ODM_BW20M = 0,
- ODM_BW40M = 1,
-};
-
struct odm_ra_info {
u8 RateID;
u32 RateMask;
--
2.35.1
next prev parent reply other threads:[~2022-02-21 7:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 7:33 [PATCH v2 0/5] staging: r8188eu: odm cleanups Michael Straube
2022-02-21 7:33 ` [PATCH v2 1/5] staging: r8188eu: remove ODM_CmnInfoHook() Michael Straube
2022-02-21 7:33 ` [PATCH v2 2/5] staging: r8188eu: convert two u8 variables to bool Michael Straube
2022-02-21 7:33 ` Michael Straube [this message]
2022-02-21 7:33 ` [PATCH v2 4/5] staging: r8188eu: convert type of pBandWidth in odm_dm_struct Michael Straube
2022-02-21 7:33 ` [PATCH v2 5/5] staging: r8188eu: remove ODM_CmnInfoUpdate() Michael Straube
2022-02-21 17:13 ` [PATCH v2 0/5] staging: r8188eu: odm cleanups Greg KH
2022-02-21 18:48 ` Michael Straube
2022-02-21 18:53 ` Greg KH
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=20220221073306.16636-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