Commit 15f11e0f authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: reuse Hal_GetChnlGroup88E() 



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

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a793dbe9

drivers/staging/rtl8188eu/hal/rf.c

+3 −14
Original line number Diff line number Diff line
@@ -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 */

			if (hal_data->pwrGroupCnt == 1)

				chnlGroup = 0;

			if (hal_data->pwrGroupCnt >= hal_data->PGMaxGroup) {

				if (channel < 3)

					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;

			}

			if (hal_data->pwrGroupCnt >= hal_data->PGMaxGroup)

				Hal_GetChnlGroup88E(channel, &chnlGroup);



			write_val = hal_data->MCSTxPowerLevelOriginalOffset[chnlGroup][index+(rf ? 8 : 0)] +

					((index < 2) ? powerbase0[rf] : powerbase1[rf]);

			break;

drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

		*group = 0;

drivers/staging/rtl8188eu/include/rtl8188e_hal.h

+2 −0
Original line number Diff line number Diff line
@@ -329,6 +329,8 @@ struct hal_data_8188e { 
	u8	UsbRxAggPageTimeout;

};



void Hal_GetChnlGroup88E(u8 chnl, u8 *group);



/*  rtl8188e_hal_init.c */

void _8051Reset88E(struct adapter *padapter);

void rtl8188e_InitializeFirmwareVars(struct adapter *padapter);

CRA Git | Maintained and supported by SUSTech CRA and CCSE