iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: rtl8188eu: reuse Hal_GetChnlGroup88E()

Browse Source 
Use Hal_GetChnlGroup88E() instead of duplicating it's code
in get_rx_power_val_by_reg().

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Straube 2018-12-07 21:55:15 +01:00 committed by Greg Kroah-Hartman
parent a793dbe926
commit 15f11e0ffc
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/rtl8188eu/hal/rf.c
View File

@ -164,20 +164,9 @@ static void get_rx_power_val_by_reg(struct adapter *adapt, u8 channel,
/* increase power diff defined by Realtek for regulatory */ /* increase power diff defined by Realtek for regulatory */
if (hal_data->pwrGroupCnt == 1) if (hal_data->pwrGroupCnt == 1)
chnlGroup = 0; chnlGroup = 0;
if (hal_data->pwrGroupCnt >= hal_data->PGMaxGroup) { if (hal_data->pwrGroupCnt >= hal_data->PGMaxGroup)
if (channel < 3) Hal_GetChnlGroup88E(channel, &chnlGroup);
chnlGroup = 0;
else if (channel < 6)
chnlGroup = 1;
else if (channel < 9)
chnlGroup = 2;
else if (channel < 12)
chnlGroup = 3;
else if (channel < 14)
chnlGroup = 4;
else if (channel == 14)
chnlGroup = 5;
}
write_val = hal_data->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf ? 8 : 0)] + write_val = hal_data->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf ? 8 : 0)] +
((index < 2) ? powerbase0[rf] : powerbase1[rf]); ((index < 2) ? powerbase0[rf] : powerbase1[rf]);
break; break;

2
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
View File

@ -373,7 +373,7 @@ static void Hal_ReadPowerValueFromPROM_8188E(struct txpowerinfo24g *pwrInfo24G,
} }
} }
static void Hal_GetChnlGroup88E(u8 chnl, u8 *group) void Hal_GetChnlGroup88E(u8 chnl, u8 *group)
{ {
if (chnl < 3) /* Channel 1-2 */ if (chnl < 3) /* Channel 1-2 */
*group = 0; *group = 0;

2
drivers/staging/rtl8188eu/include/rtl8188e_hal.h
View File

@ -329,6 +329,8 @@ struct hal_data_8188e {
u8 UsbRxAggPageTimeout; u8 UsbRxAggPageTimeout;
}; };
void Hal_GetChnlGroup88E(u8 chnl, u8 *group);
/* rtl8188e_hal_init.c */ /* rtl8188e_hal_init.c */
void _8051Reset88E(struct adapter *padapter); void _8051Reset88E(struct adapter *padapter);
void rtl8188e_InitializeFirmwareVars(struct adapter *padapter); void rtl8188e_InitializeFirmwareVars(struct adapter *padapter);