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

staging: r8188eu: remove NumTotalRFPath from struct hal_data_8188e 



NumTotalRFPath is 1 in this driver and it is only used as exit condition
in for loops. Since NumTotalRFPath is always 1, all the loops have only a
single iteration. So we can remove the for loops and the NumTotalRFPath
variable.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210917080615.25819-4-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17be2176

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+24 −26
Original line number Diff line number Diff line
@@ -1691,7 +1691,6 @@ void rtl8188e_read_chip_version(struct adapter *padapter) 
	pHalData->VersionID = ChipVersion;



	pHalData->rf_type = RF_1T1R;

	pHalData->NumTotalRFPath = 1;



	MSG_88E("RF_Type is %x!!\n", pHalData->rf_type);

}
@@ -1999,7 +1998,8 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto 
{

	struct hal_data_8188e	*pHalData = GET_HAL_DATA(padapter);

	struct txpowerinfo24g pwrInfo24G;

	u8 rfPath, ch, group;

	u8 rfPath = 0;

	u8 ch, group;

	u8 TxCount;



	Hal_ReadPowerValueFromPROM_8188E(&pwrInfo24G, PROMContent, AutoLoadFail);
@@ -2007,7 +2007,6 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto 
	if (!AutoLoadFail)

		pHalData->bTXPowerDataReadFromEEPORM = true;



	for (rfPath = 0; rfPath < pHalData->NumTotalRFPath; rfPath++) {

	for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {

		hal_get_chnl_group_88e(ch, &group);
@@ -2032,7 +2031,6 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto 
		DBG_88E("BW20_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->BW20_24G_Diff[rfPath][TxCount]);

		DBG_88E("BW40_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->BW40_24G_Diff[rfPath][TxCount]);

	}

	}



	/*  2010/10/19 MH Add Regulator recognize for CU. */

	if (!AutoLoadFail) {

drivers/staging/r8188eu/hal/rtl8188e_mp.c

+2 −3
Original line number Diff line number Diff line
@@ -143,11 +143,10 @@ void Hal_SetChannel(struct adapter *pAdapter) 
	struct hal_data_8188e	*pHalData = GET_HAL_DATA(pAdapter);

	struct mp_priv	*pmp = &pAdapter->mppriv;

	struct odm_dm_struct *pDM_Odm = &pHalData->odmpriv;

	u8		eRFPath;

	u8		eRFPath = 0;

	u8		channel = pmp->channel;



	/*  set RF channel register */

	for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++)

	_write_rfreg(pAdapter, eRFPath, ODM_CHANNEL, 0x3FF, channel);

	Hal_mpt_SwitchRfSetting(pAdapter);

drivers/staging/r8188eu/hal/rtl8188e_phycfg.c

+3 −5
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ void PHY_SetBWMode8188E(struct adapter *Adapter, enum ht_channel_width Bandwidth 


static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel)

{

	u8 eRFPath;

	u8 eRFPath = 0;

	u32 param1, param2;

	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
@@ -876,11 +876,9 @@ static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel) 
	/* s2. RF dependent command - CmdID_RF_WriteReg, param1=RF_CHNLBW, param2=channel */

	param1 = RF_CHNLBW;

	param2 = channel;

	for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++) {

	pHalData->RfRegChnlVal[eRFPath] = ((pHalData->RfRegChnlVal[eRFPath] & 0xfffffc00) | param2);

	PHY_SetRFReg(Adapter, (enum rf_radio_path)eRFPath, param1, bRFRegOffsetMask, pHalData->RfRegChnlVal[eRFPath]);

}

}



void PHY_SwChnl8188E(struct adapter *Adapter, u8 channel)

{

drivers/staging/r8188eu/hal/rtl8188e_rf6052.c

+68 −73
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static void getpowerbase88e(struct adapter *Adapter, u8 *pPowerLevelOFDM, 
		powerBase0 = (powerBase0 << 24) | (powerBase0 << 16) | (powerBase0 << 8) | powerBase0;

		*(OfdmBase + i) = powerBase0;

	}

	for (i = 0; i < pHalData->NumTotalRFPath; i++) {



	/* Check HT20 to HT40 diff */

	if (pHalData->CurrentChannelBW == HT_CHANNEL_WIDTH_20)

		powerlevel[i] = pPowerLevelBW20[i];
@@ -245,7 +245,7 @@ static void getpowerbase88e(struct adapter *Adapter, u8 *pPowerLevelOFDM, 
	powerBase1 = (powerBase1 << 24) | (powerBase1 << 16) | (powerBase1 << 8) | powerBase1;

	*(MCSBase + i) = powerBase1;

}

}



static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel,

				    u8 index, u32 *powerBase0, u32 *powerBase1,

				    u32 *pOutWriteVal)
@@ -458,13 +458,11 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter) 
	struct bb_reg_def *pPhyReg;

	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);

	u32 u4RegValue = 0;

	u8 eRFPath;

	u8 eRFPath = 0;

	int rtStatus = _SUCCESS;



	/* 3----------------------------------------------------------------- */

	/* 3 <2> Initialize RF */

	/* 3----------------------------------------------------------------- */

	for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++) {

	/* Initialize RF */



	pPhyReg = &pHalData->PHYRegDef[eRFPath];



	/*----Store original RFENV control type----*/
@@ -521,7 +519,7 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter) 
	}

	if (rtStatus != _SUCCESS)

		goto phy_RF6052_Config_ParaFile_Fail;

	}



	return rtStatus;



phy_RF6052_Config_ParaFile_Fail:
@@ -530,11 +528,8 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter) 


int PHY_RF6052_Config8188E(struct adapter *Adapter)

{

	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);

	int rtStatus = _SUCCESS;



	pHalData->NumTotalRFPath = 1;



	/*  */

	/*  Config BB and RF */

	/*  */

drivers/staging/r8188eu/include/rtl8188e_hal.h

+0 −1
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ struct hal_data_8188e { 
	/* rf_ctrl */

	u8	rf_chip;

	u8	rf_type;

	u8	NumTotalRFPath;



	u8	BoardType;