staging: rtl8188eu: remove 5 GHz code from Hal_GetChnlGroup88E()
PATCH 1/4 staging: rtl8188eu: remove 5 GHz code from Hal_GetChnlGroup88E()
Remove code valid only for 5 GHz from Hal_GetChnlGroup88E(). This addresses the below TODO item.
- find and remove remaining code valid only for 5 GHz. Most of the obvious ones have been removed, but things like channel > 14 still exist.
--- .../staging/rtl8188eu/hal/rtl8188e_hal_init.c | 60 ++++--------------- 1 file changed, 13 insertions(+), 47 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +13 -47
@@ -382,53 +382,19 @@ static u8 Hal_GetChnlGroup88E(u8 chnl, u8 *pGroup) {u8 bIn24G = true; -if (chnl <=14 ) { - bIn24G = true; - -if (chnl <3 )/* Channel 1-2 */ - *pGroup =0 ; -else if (chnl <6 )/* Channel 3-5 */ - *pGroup =1 ; -else if (chnl <9 )/* Channel 6-8 */ - *pGroup =2 ; -else if (chnl <12 )/* Channel 9-11 */ - *pGroup =3 ; -else if (chnl <14 )/* Channel 12-13 */ - *pGroup =4 ; -else if (chnl ==14 )/* Channel 14 */ - *pGroup =5 ; - }else { -/* probably, this branch is suitable only for 5 GHz */ - - bIn24G = false; - -if (chnl <=40 ) - *pGroup =0 ; -else if (chnl <=48 ) - *pGroup =1 ; -else if (chnl <=56 ) - *pGroup =2 ; -else if (chnl <=64 ) - *pGroup =3 ; -else if (chnl <=104 ) - *pGroup =4 ; -else if (chnl <=112 ) - *pGroup =5 ; -else if (chnl <=120 ) - *pGroup =5 ; -else if (chnl <=128 ) - *pGroup =6 ; -else if (chnl <=136 ) - *pGroup =7 ; -else if (chnl <=144 ) - *pGroup =8 ; -else if (chnl <=153 ) - *pGroup =9 ; -else if (chnl <=161 ) - *pGroup =10 ; -else if (chnl <=177 ) - *pGroup =11 ; - } +if (chnl <3 )/* Channel 1-2 */ + *pGroup =0 ; +else if (chnl <6 )/* Channel 3-5 */ + *pGroup =1 ; +else if (chnl <9 )/* Channel 6-8 */ + *pGroup =2 ; +else if (chnl <12 )/* Channel 9-11 */ + *pGroup =3 ; +else if (chnl <14 )/* Channel 12-13 */ + *pGroup =4 ; +else if (chnl ==14 )/* Channel 14 */ + *pGroup =5 ; +return bIn24G; }
Signature · 1 line
2.19.0
PATCH 2/4 staging: rtl8188eu: change return type of Hal_GetChnlGroup88E()
After the removal of code valid only for 5 GHz the function Hal_GetChnlGroup88E returns always true.
Change the return type to void and remove the variable bIn24G.
Remove the tests for the return value and the variable bIn24G from the only user Hal_ReadTxPowerInfo88E().
--- .../staging/rtl8188eu/hal/rtl8188e_hal_init.c | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +12 -19
@@ -378,10 +378,8 @@ static void Hal_ReadPowerValueFromPROM_8188E(struct txpowerinfo24g *pwrInfo24G, } } -static u8 Hal_GetChnlGroup88E (u8 chnl,u8 *pGroup) +static void Hal_GetChnlGroup88E (u8 chnl,u8 *pGroup) { -u8 bIn24G = true; -if (chnl <3 )/* Channel 1-2 */ *pGroup =0 ;else if (chnl <6 )/* Channel 3-5 */
@@ -394,8 +392,6 @@ static u8 Hal_GetChnlGroup88E(u8 chnl, u8 *pGroup) *pGroup =4 ; else if (chnl == 14) /* Channel 14 */ *pGroup =5 ; - -return bIn24G; }void Hal_ReadPowerSavingMode88E (struct adapter *padapter,u8 *hwinfo,bool AutoLoadFail)
@@ -427,7 +423,7 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Autostruct hal_data_8188e *pHalData = padapter->HalData;struct txpowerinfo24g pwrInfo24G;u8 ch, group; -u8 bIn24G, TxCount; +u8 TxCount;Hal_ReadPowerValueFromPROM_8188E (&pwrInfo24G, PROMContent, AutoLoadFail);
@@ -435,19 +431,16 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto pHalData->bTXPowerDataReadFromEEPORM = true;for (ch =0 ; ch <CHANNEL_MAX_NUMBER ; ch++) { - bIn24G =Hal_GetChnlGroup88E (ch, &group); -if (bIn24G) { - pHalData->Index24G_CCK_Base[0 ][ch] = pwrInfo24G.IndexCCK_Base[0 ][group]; -if (ch ==14 ) - pHalData->Index24G_BW40_Base[0 ][ch] = pwrInfo24G.IndexBW40_Base[0 ][4 ]; -else - pHalData->Index24G_BW40_Base[0 ][ch] = pwrInfo24G.IndexBW40_Base[0 ][group]; - } -if (bIn24G) { -DBG_88E ("======= Path %d, Channel %d =======\n" ,0 , ch); -DBG_88E ("Index24G_CCK_Base[%d][%d] = 0x%x\n" ,0 , ch, pHalData->Index24G_CCK_Base[0 ][ch]); -DBG_88E ("Index24G_BW40_Base[%d][%d] = 0x%x\n" ,0 , ch, pHalData->Index24G_BW40_Base[0 ][ch]); - } +Hal_GetChnlGroup88E (ch, &group); + pHalData->Index24G_CCK_Base[0 ][ch] = pwrInfo24G.IndexCCK_Base[0 ][group]; +if (ch ==14 ) + pHalData->Index24G_BW40_Base[0 ][ch] = pwrInfo24G.IndexBW40_Base[0 ][4 ]; +else + pHalData->Index24G_BW40_Base[0 ][ch] = pwrInfo24G.IndexBW40_Base[0 ][group]; + +DBG_88E ("======= Path %d, Channel %d =======\n" ,0 , ch); +DBG_88E ("Index24G_CCK_Base[%d][%d] = 0x%x\n" ,0 , ch, pHalData->Index24G_CCK_Base[0 ][ch]); +DBG_88E ("Index24G_BW40_Base[%d][%d] = 0x%x\n" ,0 , ch, pHalData->Index24G_BW40_Base[0 ][ch]); }for (TxCount =0 ; TxCount <MAX_TX_COUNT ; TxCount++) { pHalData->CCK_24G_Diff[0 ][TxCount] = pwrInfo24G.CCK_Diff[0 ][TxCount];
Signature · 1 line
2.19.0
PATCH 3/4 staging: rtl8188eu: rename parameter of Hal_GetChnlGroup88E()
In reply to Michael StraubeRename function parameter of Hal_GetChnlGroup88E() to avoid CamelCase. pGroup -> group
--- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +7 -7
@@ -378,20 +378,20 @@ static void Hal_ReadPowerValueFromPROM_8188E(struct txpowerinfo24g *pwrInfo24G, } } -static void Hal_GetChnlGroup88E (u8 chnl,u8 *pGroup) +static void Hal_GetChnlGroup88E (u8 chnl,u8 *group) {if (chnl <3 )/* Channel 1-2 */ - *pGroup =0 ; + *group =0 ;else if (chnl <6 )/* Channel 3-5 */ - *pGroup =1 ; + *group =1 ;else if (chnl <9 )/* Channel 6-8 */ - *pGroup =2 ; + *group =2 ;else if (chnl <12 )/* Channel 9-11 */ - *pGroup =3 ; + *group =3 ;else if (chnl <14 )/* Channel 12-13 */ - *pGroup =4 ; + *group =4 ;else if (chnl ==14 )/* Channel 14 */ - *pGroup =5 ; + *group =5 ; }void Hal_ReadPowerSavingMode88E (struct adapter *padapter,u8 *hwinfo,bool AutoLoadFail)
Signature · 1 line
2.19.0
PATCH 4/4 staging: rtl8188eu: clean function definitions - style
In reply to Michael StraubeDo not line break function definitions where not needed and move the return type to the same line.
--- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +2 -7
@@ -240,8 +240,7 @@ s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy)return status; } -void -Hal_InitPGData88E (struct adapter *padapter) +void Hal_InitPGData88E (struct adapter *padapter) {struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (padapter);
@@ -258,11 +257,7 @@ Hal_InitPGData88E(struct adapter *padapter) } } -void -Hal_EfuseParseIDCode88E ( -struct adapter *padapter, -u8 *hwinfo - ) +void Hal_EfuseParseIDCode88E (struct adapter *padapter,u8 *hwinfo) {struct eeprom_priv *pEEPROM =GET_EEPROM_EFUSE_PRIV (padapter);u16 EEPROMId;
Signature · 1 line
2.19.0