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: Michael Straube <straube.linux@gmail.com> Link: https://lore.kernel.org/r/20210917080615.25819-4-straube.linux@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
17be217613
commit
f7b687d6b6
@@ -1691,7 +1691,6 @@ void rtl8188e_read_chip_version(struct adapter *padapter)
|
|||||||
pHalData->VersionID = ChipVersion;
|
pHalData->VersionID = ChipVersion;
|
||||||
|
|
||||||
pHalData->rf_type = RF_1T1R;
|
pHalData->rf_type = RF_1T1R;
|
||||||
pHalData->NumTotalRFPath = 1;
|
|
||||||
|
|
||||||
MSG_88E("RF_Type is %x!!\n", pHalData->rf_type);
|
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 hal_data_8188e *pHalData = GET_HAL_DATA(padapter);
|
||||||
struct txpowerinfo24g pwrInfo24G;
|
struct txpowerinfo24g pwrInfo24G;
|
||||||
u8 rfPath, ch, group;
|
u8 rfPath = 0;
|
||||||
|
u8 ch, group;
|
||||||
u8 TxCount;
|
u8 TxCount;
|
||||||
|
|
||||||
Hal_ReadPowerValueFromPROM_8188E(&pwrInfo24G, PROMContent, AutoLoadFail);
|
Hal_ReadPowerValueFromPROM_8188E(&pwrInfo24G, PROMContent, AutoLoadFail);
|
||||||
@@ -2007,31 +2007,29 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto
|
|||||||
if (!AutoLoadFail)
|
if (!AutoLoadFail)
|
||||||
pHalData->bTXPowerDataReadFromEEPORM = true;
|
pHalData->bTXPowerDataReadFromEEPORM = true;
|
||||||
|
|
||||||
for (rfPath = 0; rfPath < pHalData->NumTotalRFPath; rfPath++) {
|
for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {
|
||||||
for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {
|
hal_get_chnl_group_88e(ch, &group);
|
||||||
hal_get_chnl_group_88e(ch, &group);
|
|
||||||
|
|
||||||
pHalData->Index24G_CCK_Base[rfPath][ch] = pwrInfo24G.IndexCCK_Base[rfPath][group];
|
pHalData->Index24G_CCK_Base[rfPath][ch] = pwrInfo24G.IndexCCK_Base[rfPath][group];
|
||||||
if (ch == 14)
|
if (ch == 14)
|
||||||
pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][4];
|
pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][4];
|
||||||
else
|
else
|
||||||
pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][group];
|
pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][group];
|
||||||
|
|
||||||
DBG_88E("======= Path %d, Channel %d =======\n", rfPath, ch);
|
DBG_88E("======= Path %d, Channel %d =======\n", rfPath, ch);
|
||||||
DBG_88E("Index24G_CCK_Base[%d][%d] = 0x%x\n", rfPath, ch, pHalData->Index24G_CCK_Base[rfPath][ch]);
|
DBG_88E("Index24G_CCK_Base[%d][%d] = 0x%x\n", rfPath, ch, pHalData->Index24G_CCK_Base[rfPath][ch]);
|
||||||
DBG_88E("Index24G_BW40_Base[%d][%d] = 0x%x\n", rfPath, ch, pHalData->Index24G_BW40_Base[rfPath][ch]);
|
DBG_88E("Index24G_BW40_Base[%d][%d] = 0x%x\n", rfPath, ch, pHalData->Index24G_BW40_Base[rfPath][ch]);
|
||||||
}
|
}
|
||||||
for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
|
for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {
|
||||||
pHalData->CCK_24G_Diff[rfPath][TxCount] = pwrInfo24G.CCK_Diff[rfPath][TxCount];
|
pHalData->CCK_24G_Diff[rfPath][TxCount] = pwrInfo24G.CCK_Diff[rfPath][TxCount];
|
||||||
pHalData->OFDM_24G_Diff[rfPath][TxCount] = pwrInfo24G.OFDM_Diff[rfPath][TxCount];
|
pHalData->OFDM_24G_Diff[rfPath][TxCount] = pwrInfo24G.OFDM_Diff[rfPath][TxCount];
|
||||||
pHalData->BW20_24G_Diff[rfPath][TxCount] = pwrInfo24G.BW20_Diff[rfPath][TxCount];
|
pHalData->BW20_24G_Diff[rfPath][TxCount] = pwrInfo24G.BW20_Diff[rfPath][TxCount];
|
||||||
pHalData->BW40_24G_Diff[rfPath][TxCount] = pwrInfo24G.BW40_Diff[rfPath][TxCount];
|
pHalData->BW40_24G_Diff[rfPath][TxCount] = pwrInfo24G.BW40_Diff[rfPath][TxCount];
|
||||||
DBG_88E("======= TxCount %d =======\n", TxCount);
|
DBG_88E("======= TxCount %d =======\n", TxCount);
|
||||||
DBG_88E("CCK_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->CCK_24G_Diff[rfPath][TxCount]);
|
DBG_88E("CCK_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->CCK_24G_Diff[rfPath][TxCount]);
|
||||||
DBG_88E("OFDM_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->OFDM_24G_Diff[rfPath][TxCount]);
|
DBG_88E("OFDM_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->OFDM_24G_Diff[rfPath][TxCount]);
|
||||||
DBG_88E("BW20_24G_Diff[%d][%d] = %d\n", rfPath, TxCount, pHalData->BW20_24G_Diff[rfPath][TxCount]);
|
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]);
|
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. */
|
/* 2010/10/19 MH Add Regulator recognize for CU. */
|
||||||
|
|||||||
@@ -143,12 +143,11 @@ void Hal_SetChannel(struct adapter *pAdapter)
|
|||||||
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
|
struct hal_data_8188e *pHalData = GET_HAL_DATA(pAdapter);
|
||||||
struct mp_priv *pmp = &pAdapter->mppriv;
|
struct mp_priv *pmp = &pAdapter->mppriv;
|
||||||
struct odm_dm_struct *pDM_Odm = &pHalData->odmpriv;
|
struct odm_dm_struct *pDM_Odm = &pHalData->odmpriv;
|
||||||
u8 eRFPath;
|
u8 eRFPath = 0;
|
||||||
u8 channel = pmp->channel;
|
u8 channel = pmp->channel;
|
||||||
|
|
||||||
/* set RF channel register */
|
/* set RF channel register */
|
||||||
for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++)
|
_write_rfreg(pAdapter, eRFPath, ODM_CHANNEL, 0x3FF, channel);
|
||||||
_write_rfreg(pAdapter, eRFPath, ODM_CHANNEL, 0x3FF, channel);
|
|
||||||
Hal_mpt_SwitchRfSetting(pAdapter);
|
Hal_mpt_SwitchRfSetting(pAdapter);
|
||||||
|
|
||||||
SelectChannel(pAdapter, channel);
|
SelectChannel(pAdapter, channel);
|
||||||
|
|||||||
@@ -863,7 +863,7 @@ void PHY_SetBWMode8188E(struct adapter *Adapter, enum ht_channel_width Bandwidth
|
|||||||
|
|
||||||
static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel)
|
static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel)
|
||||||
{
|
{
|
||||||
u8 eRFPath;
|
u8 eRFPath = 0;
|
||||||
u32 param1, param2;
|
u32 param1, param2;
|
||||||
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
|
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
|
||||||
|
|
||||||
@@ -876,10 +876,8 @@ static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel)
|
|||||||
/* s2. RF dependent command - CmdID_RF_WriteReg, param1=RF_CHNLBW, param2=channel */
|
/* s2. RF dependent command - CmdID_RF_WriteReg, param1=RF_CHNLBW, param2=channel */
|
||||||
param1 = RF_CHNLBW;
|
param1 = RF_CHNLBW;
|
||||||
param2 = channel;
|
param2 = channel;
|
||||||
for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++) {
|
pHalData->RfRegChnlVal[eRFPath] = ((pHalData->RfRegChnlVal[eRFPath] & 0xfffffc00) | param2);
|
||||||
pHalData->RfRegChnlVal[eRFPath] = ((pHalData->RfRegChnlVal[eRFPath] & 0xfffffc00) | param2);
|
PHY_SetRFReg(Adapter, (enum rf_radio_path)eRFPath, param1, bRFRegOffsetMask, pHalData->RfRegChnlVal[eRFPath]);
|
||||||
PHY_SetRFReg(Adapter, (enum rf_radio_path)eRFPath, param1, bRFRegOffsetMask, pHalData->RfRegChnlVal[eRFPath]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PHY_SwChnl8188E(struct adapter *Adapter, u8 channel)
|
void PHY_SwChnl8188E(struct adapter *Adapter, u8 channel)
|
||||||
|
|||||||
@@ -235,17 +235,17 @@ static void getpowerbase88e(struct adapter *Adapter, u8 *pPowerLevelOFDM,
|
|||||||
powerBase0 = (powerBase0 << 24) | (powerBase0 << 16) | (powerBase0 << 8) | powerBase0;
|
powerBase0 = (powerBase0 << 24) | (powerBase0 << 16) | (powerBase0 << 8) | powerBase0;
|
||||||
*(OfdmBase + i) = powerBase0;
|
*(OfdmBase + i) = powerBase0;
|
||||||
}
|
}
|
||||||
for (i = 0; i < pHalData->NumTotalRFPath; i++) {
|
|
||||||
/* Check HT20 to HT40 diff */
|
/* Check HT20 to HT40 diff */
|
||||||
if (pHalData->CurrentChannelBW == HT_CHANNEL_WIDTH_20)
|
if (pHalData->CurrentChannelBW == HT_CHANNEL_WIDTH_20)
|
||||||
powerlevel[i] = pPowerLevelBW20[i];
|
powerlevel[i] = pPowerLevelBW20[i];
|
||||||
else
|
else
|
||||||
powerlevel[i] = pPowerLevelBW40[i];
|
powerlevel[i] = pPowerLevelBW40[i];
|
||||||
powerBase1 = powerlevel[i];
|
powerBase1 = powerlevel[i];
|
||||||
powerBase1 = (powerBase1 << 24) | (powerBase1 << 16) | (powerBase1 << 8) | powerBase1;
|
powerBase1 = (powerBase1 << 24) | (powerBase1 << 16) | (powerBase1 << 8) | powerBase1;
|
||||||
*(MCSBase + i) = powerBase1;
|
*(MCSBase + i) = powerBase1;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel,
|
static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel,
|
||||||
u8 index, u32 *powerBase0, u32 *powerBase1,
|
u8 index, u32 *powerBase0, u32 *powerBase1,
|
||||||
u32 *pOutWriteVal)
|
u32 *pOutWriteVal)
|
||||||
@@ -458,70 +458,68 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter)
|
|||||||
struct bb_reg_def *pPhyReg;
|
struct bb_reg_def *pPhyReg;
|
||||||
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
|
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
|
||||||
u32 u4RegValue = 0;
|
u32 u4RegValue = 0;
|
||||||
u8 eRFPath;
|
u8 eRFPath = 0;
|
||||||
int rtStatus = _SUCCESS;
|
int rtStatus = _SUCCESS;
|
||||||
|
|
||||||
/* 3----------------------------------------------------------------- */
|
/* Initialize RF */
|
||||||
/* 3 <2> Initialize RF */
|
|
||||||
/* 3----------------------------------------------------------------- */
|
|
||||||
for (eRFPath = 0; eRFPath < pHalData->NumTotalRFPath; eRFPath++) {
|
|
||||||
pPhyReg = &pHalData->PHYRegDef[eRFPath];
|
|
||||||
|
|
||||||
/*----Store original RFENV control type----*/
|
pPhyReg = &pHalData->PHYRegDef[eRFPath];
|
||||||
switch (eRFPath) {
|
|
||||||
case RF_PATH_A:
|
|
||||||
case RF_PATH_C:
|
|
||||||
u4RegValue = PHY_QueryBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV);
|
|
||||||
break;
|
|
||||||
case RF_PATH_B:
|
|
||||||
case RF_PATH_D:
|
|
||||||
u4RegValue = PHY_QueryBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV << 16);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
/*----Set RF_ENV enable----*/
|
|
||||||
PHY_SetBBReg(Adapter, pPhyReg->rfintfe, bRFSI_RFENV << 16, 0x1);
|
|
||||||
udelay(1);/* PlatformStallExecution(1); */
|
|
||||||
|
|
||||||
/*----Set RF_ENV output high----*/
|
/*----Store original RFENV control type----*/
|
||||||
PHY_SetBBReg(Adapter, pPhyReg->rfintfo, bRFSI_RFENV, 0x1);
|
switch (eRFPath) {
|
||||||
udelay(1);/* PlatformStallExecution(1); */
|
case RF_PATH_A:
|
||||||
|
case RF_PATH_C:
|
||||||
/* Set bit number of Address and Data for RF register */
|
u4RegValue = PHY_QueryBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV);
|
||||||
PHY_SetBBReg(Adapter, pPhyReg->rfHSSIPara2, b3WireAddressLength, 0x0); /* Set 1 to 4 bits for 8255 */
|
break;
|
||||||
udelay(1);/* PlatformStallExecution(1); */
|
case RF_PATH_B:
|
||||||
|
case RF_PATH_D:
|
||||||
PHY_SetBBReg(Adapter, pPhyReg->rfHSSIPara2, b3WireDataLength, 0x0); /* Set 0 to 12 bits for 8255 */
|
u4RegValue = PHY_QueryBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV << 16);
|
||||||
udelay(1);/* PlatformStallExecution(1); */
|
break;
|
||||||
|
|
||||||
/*----Initialize RF fom connfiguration file----*/
|
|
||||||
switch (eRFPath) {
|
|
||||||
case RF_PATH_A:
|
|
||||||
if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, (enum rf_radio_path)eRFPath, (enum rf_radio_path)eRFPath))
|
|
||||||
rtStatus = _FAIL;
|
|
||||||
break;
|
|
||||||
case RF_PATH_B:
|
|
||||||
if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, (enum rf_radio_path)eRFPath, (enum rf_radio_path)eRFPath))
|
|
||||||
rtStatus = _FAIL;
|
|
||||||
break;
|
|
||||||
case RF_PATH_C:
|
|
||||||
break;
|
|
||||||
case RF_PATH_D:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
/*----Restore RFENV control type----*/;
|
|
||||||
switch (eRFPath) {
|
|
||||||
case RF_PATH_A:
|
|
||||||
case RF_PATH_C:
|
|
||||||
PHY_SetBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue);
|
|
||||||
break;
|
|
||||||
case RF_PATH_B:
|
|
||||||
case RF_PATH_D:
|
|
||||||
PHY_SetBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV << 16, u4RegValue);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (rtStatus != _SUCCESS)
|
|
||||||
goto phy_RF6052_Config_ParaFile_Fail;
|
|
||||||
}
|
}
|
||||||
|
/*----Set RF_ENV enable----*/
|
||||||
|
PHY_SetBBReg(Adapter, pPhyReg->rfintfe, bRFSI_RFENV << 16, 0x1);
|
||||||
|
udelay(1);/* PlatformStallExecution(1); */
|
||||||
|
|
||||||
|
/*----Set RF_ENV output high----*/
|
||||||
|
PHY_SetBBReg(Adapter, pPhyReg->rfintfo, bRFSI_RFENV, 0x1);
|
||||||
|
udelay(1);/* PlatformStallExecution(1); */
|
||||||
|
|
||||||
|
/* Set bit number of Address and Data for RF register */
|
||||||
|
PHY_SetBBReg(Adapter, pPhyReg->rfHSSIPara2, b3WireAddressLength, 0x0); /* Set 1 to 4 bits for 8255 */
|
||||||
|
udelay(1);/* PlatformStallExecution(1); */
|
||||||
|
|
||||||
|
PHY_SetBBReg(Adapter, pPhyReg->rfHSSIPara2, b3WireDataLength, 0x0); /* Set 0 to 12 bits for 8255 */
|
||||||
|
udelay(1);/* PlatformStallExecution(1); */
|
||||||
|
|
||||||
|
/*----Initialize RF fom connfiguration file----*/
|
||||||
|
switch (eRFPath) {
|
||||||
|
case RF_PATH_A:
|
||||||
|
if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, (enum rf_radio_path)eRFPath, (enum rf_radio_path)eRFPath))
|
||||||
|
rtStatus = _FAIL;
|
||||||
|
break;
|
||||||
|
case RF_PATH_B:
|
||||||
|
if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, (enum rf_radio_path)eRFPath, (enum rf_radio_path)eRFPath))
|
||||||
|
rtStatus = _FAIL;
|
||||||
|
break;
|
||||||
|
case RF_PATH_C:
|
||||||
|
break;
|
||||||
|
case RF_PATH_D:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
/*----Restore RFENV control type----*/;
|
||||||
|
switch (eRFPath) {
|
||||||
|
case RF_PATH_A:
|
||||||
|
case RF_PATH_C:
|
||||||
|
PHY_SetBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV, u4RegValue);
|
||||||
|
break;
|
||||||
|
case RF_PATH_B:
|
||||||
|
case RF_PATH_D:
|
||||||
|
PHY_SetBBReg(Adapter, pPhyReg->rfintfs, bRFSI_RFENV << 16, u4RegValue);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (rtStatus != _SUCCESS)
|
||||||
|
goto phy_RF6052_Config_ParaFile_Fail;
|
||||||
|
|
||||||
return rtStatus;
|
return rtStatus;
|
||||||
|
|
||||||
phy_RF6052_Config_ParaFile_Fail:
|
phy_RF6052_Config_ParaFile_Fail:
|
||||||
@@ -530,11 +528,8 @@ phy_RF6052_Config_ParaFile_Fail:
|
|||||||
|
|
||||||
int PHY_RF6052_Config8188E(struct adapter *Adapter)
|
int PHY_RF6052_Config8188E(struct adapter *Adapter)
|
||||||
{
|
{
|
||||||
struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
|
|
||||||
int rtStatus = _SUCCESS;
|
int rtStatus = _SUCCESS;
|
||||||
|
|
||||||
pHalData->NumTotalRFPath = 1;
|
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
/* Config BB and RF */
|
/* Config BB and RF */
|
||||||
/* */
|
/* */
|
||||||
|
|||||||
@@ -228,7 +228,6 @@ struct hal_data_8188e {
|
|||||||
/* rf_ctrl */
|
/* rf_ctrl */
|
||||||
u8 rf_chip;
|
u8 rf_chip;
|
||||||
u8 rf_type;
|
u8 rf_type;
|
||||||
u8 NumTotalRFPath;
|
|
||||||
|
|
||||||
u8 BoardType;
|
u8 BoardType;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user