Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16eda427 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove rf_type member of hal_data_8188e structure 



rf_type is always equal to RF_1T1R.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b95300e8

drivers/staging/rtl8188eu/hal/bb_cfg.c

+1 −4
Original line number Diff line number Diff line
@@ -518,7 +518,6 @@ 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++;

	}

	if (regaddr == rTxAGC_B_Rate18_06)
@@ -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++;

	}

}

drivers/staging/rtl8188eu/hal/phy.c

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



	for (TxCount = 0; TxCount < path_nums; TxCount++) {

		if (TxCount == RF_PATH_A) {

drivers/staging/rtl8188eu/hal/rf_cfg.c

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



	return rf6052_conf_para(adapt);

}

drivers/staging/rtl8188eu/hal/rtl8188e_dm.c

+1 −6
Original line number Diff line number Diff line
@@ -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->AntDivType = hal_data->TRxAntDivType;

drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c

+0 −3
Original line number Diff line number Diff line
@@ -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)