Commit 2d4c39b3 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman

staging: rtl8723bs: simplify function selecting channel group

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: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/a5536788004c44fe819c0eab0d19504824af46cd.1626874164.git.fabioaiuto83@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9bd9e0de
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment