Commit f75b87a6 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove rf type branching (third patch) 



remove rf_type struct member, keep all 1T1R code
unconditionally, remove the other *T*R branches.
Removed dead code related to MCS indexes above 7.

Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/e626790eb8bd7d96f939e1bbb47b899bf12dab0d.1628329348.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/hal/hal_com.c

+0 −3
Original line number Diff line number Diff line
@@ -670,9 +670,6 @@ void GetHwReg(struct adapter *adapter, u8 variable, u8 *val) 
	case HW_VAR_DM_FLAG:

		*((u32 *)val) = odm->SupportAbility;

		break;

	case HW_VAR_RF_TYPE:

		*((u8 *)val) = hal_data->rf_type;

		break;

	default:

		netdev_dbg(adapter->pnetdev,

			   FUNC_ADPT_FMT " variable(%d) not defined!\n",

drivers/staging/rtl8723bs/hal/hal_com_phycfg.c

+0 −17
Original line number Diff line number Diff line
@@ -116,12 +116,6 @@ u8 PHY_GetRateSectionIndexOfTxPowerByRate( 
		case rTxAGC_A_Mcs07_Mcs04:

			index = 3;

			break;

		case rTxAGC_A_Mcs11_Mcs08:

			index = 4;

			break;

		case rTxAGC_A_Mcs15_Mcs12:

			index = 5;

			break;

		case rTxAGC_B_Rate18_06:

			index = 8;

			break;
@@ -137,12 +131,6 @@ u8 PHY_GetRateSectionIndexOfTxPowerByRate( 
		case rTxAGC_B_Mcs07_Mcs04:

			index = 11;

			break;

		case rTxAGC_B_Mcs11_Mcs08:

			index = 12;

			break;

		case rTxAGC_B_Mcs15_Mcs12:

			index = 13;

			break;

		default:

			break;

		}
@@ -395,11 +383,6 @@ void PHY_StoreTxPowerByRate( 
		PHY_StoreTxPowerByRateNew(padapter, RfPath, TxNum, RegAddr, BitMask, Data);

	else if (pDM_Odm->PhyRegPgVersion == 0) {

		PHY_StoreTxPowerByRateOld(padapter, RegAddr, BitMask, Data);



		if (RegAddr == rTxAGC_A_Mcs15_Mcs12 && pHalData->rf_type == RF_1T1R)

			pHalData->pwrGroupCnt++;

		else if (RegAddr == rTxAGC_B_Mcs15_Mcs12 && pHalData->rf_type != RF_1T1R)

			pHalData->pwrGroupCnt++;

	}

}

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

+0 −1
Original line number Diff line number Diff line
@@ -1660,7 +1660,6 @@ static struct hal_version ReadChipVersion8723B(struct adapter *padapter) 
	dump_chip_info(ChipVersion);

#endif

	pHalData->VersionID = ChipVersion;

	pHalData->rf_type = RF_1T1R;



	return ChipVersion;

}

drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c

+1 −4
Original line number Diff line number Diff line
@@ -156,10 +156,7 @@ int PHY_RF6052_Config8723B(struct adapter *Adapter) 
	/*  */

	/*  Initialize general global value */

	/*  */

	if (pHalData->rf_type == RF_1T1R)

	pHalData->NumTotalRFPath = 1;

	else

		pHalData->NumTotalRFPath = 2;



	/*  */

	/*  Config BB and RF */

drivers/staging/rtl8723bs/hal/sdio_halinit.c

+0 −2
Original line number Diff line number Diff line
@@ -556,8 +556,6 @@ static void _InitRFType(struct adapter *padapter) 
	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);



	pHalData->rf_chip	= RF_6052;



	pHalData->rf_type = RF_1T1R;

}



static void _RfPowerSave(struct adapter *padapter)