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

staging: r8188eu: remove rf_type member of hal_data_8188e structure

Browse Source 
rf_type is always equal to RF_1T1R.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ivan Safonov 2016-09-22 21:58:43 +07:00 committed by Greg Kroah-Hartman
parent b95300e82f
commit 16eda427a3
7 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/rtl8188eu/hal/bb_cfg.c
View File

@ -518,8 +518,7 @@ static void store_pwrindex_offset(struct adapter *adapter,
power_level_offset[4] = data;
if (regaddr == rTxAGC_A_Mcs15_Mcs12) {
power_level_offset[5] = data;
if (hal_data->rf_type == RF_1T1R)
hal_data->pwrGroupCnt++;
hal_data->pwrGroupCnt++;
}
if (regaddr == rTxAGC_B_Rate18_06)
power_level_offset[8] = data;
@ -537,8 +536,6 @@ static void store_pwrindex_offset(struct adapter *adapter,
power_level_offset[12] = data;
if (regaddr == rTxAGC_B_Mcs15_Mcs12) {
power_level_offset[13] = data;
if (hal_data->rf_type != RF_1T1R)
hal_data->pwrGroupCnt++;
}
}

5
drivers/staging/rtl8188eu/hal/phy.c
View File

@ -149,10 +149,7 @@ static void get_tx_power_index(struct adapter *adapt, u8 channel, u8 *cck_pwr,
u8 index = (channel - 1);
u8 TxCount = 0, path_nums;
if ((RF_1T2R == hal_data->rf_type) || (RF_1T1R == hal_data->rf_type))
path_nums = 1;
else
path_nums = 2;
path_nums = 1;
for (TxCount = 0; TxCount < path_nums; TxCount++) {
if (TxCount == RF_PATH_A) {

5
drivers/staging/rtl8188eu/hal/rf_cfg.c
View File

@ -301,10 +301,7 @@ static bool rtl88e_phy_rf6052_config(struct adapter *adapt)
{
struct hal_data_8188e *hal_data = adapt->HalData;
if (hal_data->rf_type == RF_1T1R)
hal_data->NumTotalRFPath = 1;
else
hal_data->NumTotalRFPath = 2;
hal_data->NumTotalRFPath = 1;
return rf6052_conf_para(adapt);
}

7
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
View File

@ -57,12 +57,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter)
dm_odm->PatchID = hal_data->CustomerID;
dm_odm->bWIFITest = Adapter->registrypriv.wifi_spec;
if (hal_data->rf_type == RF_1T1R)
dm_odm->RFType = ODM_1T1R;
else if (hal_data->rf_type == RF_2T2R)
dm_odm->RFType = ODM_2T2R;
else if (hal_data->rf_type == RF_1T2R)
dm_odm->RFType = ODM_1T2R;
dm_odm->RFType = ODM_1T1R;
dm_odm->AntDivType = hal_data->TRxAntDivType;

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

@ -135,10 +135,7 @@ void rtw_hal_read_chip_version(struct adapter *padapter)
dump_chip_info(ChipVersion);
pHalData->VersionID = ChipVersion;
pHalData->rf_type = RF_1T1R;
pHalData->NumTotalRFPath = 1;
MSG_88E("RF_Type is %x!!\n", pHalData->rf_type);
}
void rtw_hal_set_odm_var(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)

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

@ -1763,7 +1763,7 @@ void rtw_hal_get_hwreg(struct adapter *Adapter, u8 variable, u8 *val)
val[0] = (BIT(0) & usb_read8(Adapter, REG_TDECTRL+2)) ? true : false;
break;
case HW_VAR_RF_TYPE:
val[0] = Adapter->HalData->rf_type;
val[0] = RF_1T1R;
break;
case HW_VAR_FWLPS_RF_ON:
{

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

@ -202,7 +202,6 @@ struct hal_data_8188e {
/* rf_ctrl */
u8 rf_chip;
u8 rf_type;
u8 NumTotalRFPath;
u8 BoardType;