From: Fabio Aiuto <fabioaiuto83@gmail.com>
To: gregkh@linuxfoundation.org
Cc: hdegoede@redhat.com, Larry.Finger@lwfinger.net,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 01/16] staging: rtl8723bs: simplify function selecting channel group
Date: Wed, 21 Jul 2021 15:37:08 +0200 [thread overview]
Message-ID: <a5536788004c44fe819c0eab0d19504824af46cd.1626874164.git.fabioaiuto83@gmail.com> (raw)
In-Reply-To: <cover.1626874164.git.fabioaiuto83@gmail.com>
simplify function Hal_GetChnlGroup8723B(). It returns
an unused and unnecessary bool value telling which
band the device works on. Since we work only on
2.4Ghz band and the useful return value is the
second function argument we convert the return type to
void.
remove 5Ghz dead code either (for channel > 14).
Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
---
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 62 ++++---------------
1 file changed, 12 insertions(+), 50 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 059d3050acc6..bd0e9f05eb5c 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -2061,56 +2061,18 @@ s32 rtl8723b_InitLLTTable(struct adapter *padapter)
return ret;
}
-static bool Hal_GetChnlGroup8723B(u8 Channel, u8 *pGroup)
-{
- bool bIn24G = true;
-
- if (Channel <= 14) {
- bIn24G = true;
-
- if (1 <= Channel && Channel <= 2)
- *pGroup = 0;
- else if (3 <= Channel && Channel <= 5)
- *pGroup = 1;
- else if (6 <= Channel && Channel <= 8)
- *pGroup = 2;
- else if (9 <= Channel && Channel <= 11)
- *pGroup = 3;
- else if (12 <= Channel && Channel <= 14)
- *pGroup = 4;
- } else {
- bIn24G = false;
-
- if (36 <= Channel && Channel <= 42)
- *pGroup = 0;
- else if (44 <= Channel && Channel <= 48)
- *pGroup = 1;
- else if (50 <= Channel && Channel <= 58)
- *pGroup = 2;
- else if (60 <= Channel && Channel <= 64)
- *pGroup = 3;
- else if (100 <= Channel && Channel <= 106)
- *pGroup = 4;
- else if (108 <= Channel && Channel <= 114)
- *pGroup = 5;
- else if (116 <= Channel && Channel <= 122)
- *pGroup = 6;
- else if (124 <= Channel && Channel <= 130)
- *pGroup = 7;
- else if (132 <= Channel && Channel <= 138)
- *pGroup = 8;
- else if (140 <= Channel && Channel <= 144)
- *pGroup = 9;
- else if (149 <= Channel && Channel <= 155)
- *pGroup = 10;
- else if (157 <= Channel && Channel <= 161)
- *pGroup = 11;
- else if (165 <= Channel && Channel <= 171)
- *pGroup = 12;
- else if (173 <= Channel && Channel <= 177)
- *pGroup = 13;
- }
- return bIn24G;
+static void Hal_GetChnlGroup8723B(u8 Channel, u8 *pGroup)
+{
+ if (1 <= Channel && Channel <= 2)
+ *pGroup = 0;
+ else if (3 <= Channel && Channel <= 5)
+ *pGroup = 1;
+ else if (6 <= Channel && Channel <= 8)
+ *pGroup = 2;
+ else if (9 <= Channel && Channel <= 11)
+ *pGroup = 3;
+ else if (12 <= Channel && Channel <= 14)
+ *pGroup = 4;
}
void Hal_InitPGData(struct adapter *padapter, u8 *PROMContent)
--
2.20.1
next prev parent reply other threads:[~2021-07-21 13:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-21 13:37 [PATCH 00/16] staging: rtl8723bs: remove residual 5 Ghz code and more code cleaning Fabio Aiuto
2021-07-21 13:37 ` Fabio Aiuto [this message]
2021-07-21 13:37 ` [PATCH 02/16] staging: rtl8723bs: fix camel case inside function Fabio Aiuto
2021-07-21 13:37 ` [PATCH 03/16] staging: rtl8723bs: convert function name to snake case Fabio Aiuto
2021-07-21 13:37 ` [PATCH 04/16] staging: rtl8723bs: add spaces around operator Fabio Aiuto
2021-07-21 13:37 ` [PATCH 05/16] staging: rtl8723bs: remove 5Ghz code blocks Fabio Aiuto
2021-07-21 13:37 ` [PATCH 06/16] staging: rtl8723bs: remove commented out condition Fabio Aiuto
2021-07-21 13:37 ` [PATCH 07/16] staging: rtl8723bs: fix camel case in struct wlan_bssid_ex Fabio Aiuto
2021-07-21 13:37 ` [PATCH 08/16] staging: rtl8723bs: fix camel case in struct ndis_802_11_conf Fabio Aiuto
2021-07-21 13:37 ` [PATCH 09/16] staging: rtl8723bs: remove struct ndis_802_11_conf_fh Fabio Aiuto
2021-07-21 13:37 ` [PATCH 10/16] staging: rtl8723bs: fix camel case in struct ndis_802_11_ssid Fabio Aiuto
2021-07-21 13:37 ` [PATCH 11/16] staging: rtl8723bs: fix camel case in struct wlan_phy_info Fabio Aiuto
2021-07-21 13:37 ` [PATCH 12/16] staging: rtl8723bs: fix camel case in struct wlan_bcn_info Fabio Aiuto
2021-07-21 13:37 ` [PATCH 13/16] staging: rtl8723bs: fix camel case in IE structures Fabio Aiuto
2021-07-21 13:37 ` [PATCH 14/16] staging: rtl8723bs: remove unused struct ndis_802_11_ai_reqfi Fabio Aiuto
2021-07-21 13:37 ` [PATCH 15/16] staging: rtl8723bs: remove unused struct ndis_801_11_ai_resfi Fabio Aiuto
2021-07-21 13:37 ` [PATCH 16/16] staging: rtl8723bs: fix camel case in struct ndis_802_11_wep Fabio Aiuto
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=a5536788004c44fe819c0eab0d19504824af46cd.1626874164.git.fabioaiuto83@gmail.com \
--to=fabioaiuto83@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/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).