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 02/11] staging: r8188eu: remove struct rt_channel_plan_2g
Date: Sun, 2 Jan 2022 14:11:32 +0100 [thread overview]
Message-ID: <20220102131141.12310-3-straube.linux@gmail.com> (raw)
In-Reply-To: <20220102131141.12310-1-straube.linux@gmail.com>
The structures rt_channel_plan and rt_channel_plan_2g are identical.
Keep rt_channel_plan and remove rt_channel_plan_2g.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 +-
drivers/staging/r8188eu/include/rtw_mlme_ext.h | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 0aa958f20cd6..a9141ab1690e 100644
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -76,7 +76,7 @@ unsigned char MCS_rate_1R[16] = {0xff, 0x00, 0x0, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0,
/********************************************************
ChannelPlan definitions
*********************************************************/
-static struct rt_channel_plan_2g RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = {
+static struct rt_channel_plan RTW_ChannelPlan2G[RT_CHANNEL_DOMAIN_2G_MAX] = {
{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, /* 0x00, RT_CHANNEL_DOMAIN_2G_WORLD , Passive scan CH 12, 13 */
{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, /* 0x01, RT_CHANNEL_DOMAIN_2G_ETSI1 */
{{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 11}, /* 0x02, RT_CHANNEL_DOMAIN_2G_FCC1 */
diff --git a/drivers/staging/r8188eu/include/rtw_mlme_ext.h b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
index afdbc5e28fca..26f31f20e428 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme_ext.h
@@ -162,11 +162,6 @@ struct rt_channel_plan {
unsigned char Len;
};
-struct rt_channel_plan_2g {
- unsigned char Channel[MAX_CHANNEL_NUM];
- unsigned char Len;
-};
-
struct rt_channel_plan_map {
unsigned char Index2G;
};
--
2.34.1
next prev parent reply other threads:[~2022-01-02 13:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-02 13:11 [PATCH 00/11] staging: r8188eu: the next set of cleanups Michael Straube
2022-01-02 13:11 ` [PATCH 01/11] staging: r8188eu: remove MAX_CHANNEL_NUM_2G Michael Straube
2022-01-02 13:11 ` Michael Straube [this message]
2022-01-02 13:11 ` [PATCH 03/11] staging: r8188eu: remove unused enum and defines Michael Straube
2022-01-02 13:11 ` [PATCH 04/11] staging: r8188eu: struct rx_hpc is not used Michael Straube
2022-01-02 13:11 ` [PATCH 05/11] staging: r8188eu: clean up struct rtw_dig Michael Straube
2022-01-02 13:11 ` [PATCH 06/11] staging: r8188eu: clean up struct sw_ant_switch Michael Straube
2022-01-02 13:11 ` [PATCH 07/11] staging: r8188eu: struct odm_sta_info is not used Michael Straube
2022-01-02 13:11 ` [PATCH 08/11] staging: r8188eu: enum hw90_block " Michael Straube
2022-01-02 13:11 ` [PATCH 09/11] staging: r8188eu: remove unneeded comments from Hal8188EPhyCfg.h Michael Straube
2022-01-02 13:11 ` [PATCH 10/11] staging: r8188eu: remove unused defines " Michael Straube
2022-01-02 13:11 ` [PATCH 11/11] staging: r8188eu: remove unused defines from rtw_eeprom.h Michael Straube
2022-01-02 18:06 ` [PATCH 00/11] staging: r8188eu: the next set of cleanups Martin Kaiser
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=20220102131141.12310-3-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).