Skip to contentSkip to conversation

staging: rtl8723bs: remove some 5 GHz code

PATCH In review Michael Straube 2 participants 4 messages Mar 31, 2022 – Apr 1, 2022 Staging

lore
Share & tools
lore

Michael Straube

author
#0 lore raw

cover staging: rtl8723bs: remove some 5 GHz code

This two patches remove 5 GHz channels from the ch_freq_map array in rtw_rf.c and simplify the rtw_ch2freq() function.

Michael Straube (2):
staging: rtl8723bs: remove 5 GHz channels from ch_freq_map
staging: rtl8723bs: refactor rtw_ch2freq()

 drivers/staging/rtl8723bs/core/rtw_rf.c | 56 ++++++++-----------------
 1 file changed, 18 insertions(+), 38 deletions(-)
Signature · 1 line
2.35.1
author
#1 lore raw

PATCH 1/2 staging: rtl8723bs: remove 5 GHz channels from ch_freq_map

According to the Realtek documentation the chips this driver supports are 2.4 GHz only chips. Frequencies for 5 GHz channels can be removed from the ch_freq_map array.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/rtl8723bs/core/rtw_rf.c | 16 ----------------
 1 file changed, 16 deletions(-)
drivers/staging/rtl8723bs/core/rtw_rf.c +0 -16
index 96eb8ca38003..7e4bf42fd1ac 100644
@@ -18,22 +18,6 @@ static struct ch_freq ch_freq_map[] = {
 	{1, 2412}, {2, 2417}, {3, 2422}, {4, 2427}, {5, 2432},
 	{6, 2437}, {7, 2442}, {8, 2447}, {9, 2452}, {10, 2457},
 	{11, 2462}, {12, 2467}, {13, 2472}, {14, 2484},
-	/*  UNII */
-	{36, 5180}, {40, 5200}, {44, 5220}, {48, 5240}, {52, 5260},
-	{56, 5280}, {60, 5300}, {64, 5320}, {149, 5745}, {153, 5765},
-	{157, 5785}, {161, 5805}, {165, 5825}, {167, 5835}, {169, 5845},
-	{171, 5855}, {173, 5865},
-	/* HiperLAN2 */
-	{100, 5500}, {104, 5520}, {108, 5540}, {112, 5560}, {116, 5580},
-	{120, 5600}, {124, 5620}, {128, 5640}, {132, 5660}, {136, 5680},
-	{140, 5700},
-	/* Japan MMAC */
-	{34, 5170}, {38, 5190}, {42, 5210}, {46, 5230},
-	/*  Japan */
-	{184, 4920}, {188, 4940}, {192, 4960}, {196, 4980},
-	{208, 5040},/* Japan, means J08 */
-	{212, 5060},/* Japan, means J12 */
-	{216, 5080},/* Japan, means J16 */
 };
 
 u32 rtw_ch2freq(u32 channel)
Signature · 1 line
2.35.1
author
#2 lore raw

PATCH 2/2 staging: rtl8723bs: refactor rtw_ch2freq()

In reply to Michael Straube

Convert the array ch_freq_map to a simple integer array and use the indices as channel numbers. This simplifies the code and avoids looping through the array to get the frequency. To avoid out of bounds array access return a default value for invalid channel values, like the original code did.

Signed-off-by Michael Straube <[email protected]>
---
 drivers/staging/rtl8723bs/core/rtw_rf.c | 40 +++++++++++--------------
 1 file changed, 18 insertions(+), 22 deletions(-)
drivers/staging/rtl8723bs/core/rtw_rf.c +18 -22
index 7e4bf42fd1ac..4f120c894998 100644
@@ -8,31 +8,27 @@
 #include <drv_types.h>
 #include <linux/kernel.h>
 
-
-struct ch_freq {
-	u32 channel;
-	u32 frequency;
-};
-
-static struct ch_freq ch_freq_map[] = {
-	{1, 2412}, {2, 2417}, {3, 2422}, {4, 2427}, {5, 2432},
-	{6, 2437}, {7, 2442}, {8, 2447}, {9, 2452}, {10, 2457},
-	{11, 2462}, {12, 2467}, {13, 2472}, {14, 2484},
+static const u32 ch_freq_map[] = {
+	2412,
+	2417,
+	2422,
+	2427,
+	2432,
+	2437,
+	2442,
+	2447,
+	2452,
+	2457,
+	2462,
+	2467,
+	2472,
+	2484
 };
 
 u32 rtw_ch2freq(u32 channel)
 {
-	u8 i;
-	u32 freq = 0;
-
-	for (i = 0; i < ARRAY_SIZE(ch_freq_map); i++) {
-		if (channel == ch_freq_map[i].channel) {
-			freq = ch_freq_map[i].frequency;
-				break;
-		}
-	}
-	if (i == ARRAY_SIZE(ch_freq_map))
-		freq = 2412;
+	if (channel == 0 || channel > ARRAY_SIZE(ch_freq_map))
+		return 2412;
 
-	return freq;
+	return ch_freq_map[channel - 1];
 }
Signature · 1 line
2.35.1
Reviewed-by on the v1 series
#3 lore raw
In reply to Michael Straube

Hi,

Quoted 2 lines · Michael Straube

This two patches remove 5 GHz channels from the ch_freq_map array in rtw_rf.c and simplify the rtw_ch2freq() function.

Thanks, both patches look good to me:

Reviewed-by Hans de Goede <[email protected]>

for the series.

Regards,

Hans

Quoted 8 lines

Michael Straube (2):
staging: rtl8723bs: remove 5 GHz channels from ch_freq_map
staging: rtl8723bs: refactor rtw_ch2freq()

 drivers/staging/rtl8723bs/core/rtw_rf.c | 56 ++++++++-----------------
 1 file changed, 18 insertions(+), 38 deletions(-)