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

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



remove rf type branching, for the baseband works only on
1T1R rf type, so just keep code branches related to 1T1R.
Remove RFType from hal_version struct, and all
related code.

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


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

drivers/staging/rtl8723bs/hal/hal_com.c

+1 −9
Original line number Diff line number Diff line
@@ -70,15 +70,7 @@ void dump_chip_info(struct hal_version ChipVersion) 
		cnt += scnprintf(buf + cnt, sizeof(buf) - cnt,

				"UNKNOWN_CUT(%d)_", ChipVersion.CUTVersion);



	if (IS_1T1R(ChipVersion))

	cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "1T1R_");

	else if (IS_1T2R(ChipVersion))

		cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "1T2R_");

	else if (IS_2T2R(ChipVersion))

		cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "2T2R_");

	else

		cnt += scnprintf(buf + cnt, sizeof(buf) - cnt,

				"UNKNOWN_RFTYPE(%d)_", ChipVersion.RFType);



	cnt += scnprintf(buf + cnt, sizeof(buf) - cnt, "RomVer(%d)\n", ChipVersion.ROMVer);

}

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

+1 −7
Original line number Diff line number Diff line
@@ -1640,7 +1640,6 @@ static struct hal_version ReadChipVersion8723B(struct adapter *padapter) 
	value32 = rtw_read32(padapter, REG_SYS_CFG);

	ChipVersion.ICType = CHIP_8723B;

	ChipVersion.ChipType = ((value32 & RTL_ID) ? TEST_CHIP : NORMAL_CHIP);

	ChipVersion.RFType = RF_TYPE_1T1R;

	ChipVersion.VendorType = ((value32 & VENDOR_ID) ? CHIP_VENDOR_UMC : CHIP_VENDOR_TSMC);

	ChipVersion.CUTVersion = (value32 & CHIP_VER_RTL_MASK)>>CHIP_VER_RTL_SHIFT; /*  IC version (CUT) */
@@ -1661,11 +1660,6 @@ static struct hal_version ReadChipVersion8723B(struct adapter *padapter) 
	dump_chip_info(ChipVersion);

#endif

	pHalData->VersionID = ChipVersion;

	if (IS_1T2R(ChipVersion))

		pHalData->rf_type = RF_1T2R;

	else if (IS_2T2R(ChipVersion))

		pHalData->rf_type = RF_2T2R;

	else

	pHalData->rf_type = RF_1T1R;



	return ChipVersion;

drivers/staging/rtl8723bs/include/HalVerDef.h

+0 −18
Original line number Diff line number Diff line
@@ -50,23 +50,11 @@ enum hal_vendor_e { /* tag_HAL_Manufacturer_Version_Definition */ 
	CHIP_VENDOR_SMIC	=	2,

};



enum hal_rf_type_e { /* tag_HAL_RF_Type_Definition */

	RF_TYPE_1T1R	=	0,

	RF_TYPE_1T2R	=	1,

	RF_TYPE_2T2R	=	2,

	RF_TYPE_2T3R	=	3,

	RF_TYPE_2T4R	=	4,

	RF_TYPE_3T3R	=	5,

	RF_TYPE_3T4R	=	6,

	RF_TYPE_4T4R	=	7,

};



struct hal_version { /* tag_HAL_VERSION */

	enum hal_ic_type_e		ICType;

	enum hal_chip_type_e		ChipType;

	enum hal_cut_version_e	CUTVersion;

	enum hal_vendor_e		VendorType;

	enum hal_rf_type_e		RFType;

	u8 			ROMVer;

};
@@ -76,7 +64,6 @@ struct hal_version { /* tag_HAL_VERSION */ 
/*  Get element */

#define GET_CVID_IC_TYPE(version)			((enum hal_ic_type_e)((version).ICType))

#define GET_CVID_CHIP_TYPE(version)			((enum hal_chip_type_e)((version).ChipType))

#define GET_CVID_RF_TYPE(version)			((enum hal_rf_type_e)((version).RFType))

#define GET_CVID_MANUFACTUER(version)		((enum hal_vendor_e)((version).VendorType))

#define GET_CVID_CUT_VERSION(version)		((enum hal_cut_version_e)((version).CUTVersion))

#define GET_CVID_ROM_VERSION(version)		(((version).ROMVer) & ROM_VERSION_MASK)
@@ -105,9 +92,4 @@ struct hal_version { /* tag_HAL_VERSION */ 
#define IS_CHIP_VENDOR_UMC(version)	((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_UMC) ? true : false)

#define IS_CHIP_VENDOR_SMIC(version)	((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_SMIC) ? true : false)



/* hal_rf_type_e */

#define IS_1T1R(version)					((GET_CVID_RF_TYPE(version) == RF_TYPE_1T1R) ? true : false)

#define IS_1T2R(version)					((GET_CVID_RF_TYPE(version) == RF_TYPE_1T2R) ? true : false)

#define IS_2T2R(version)					((GET_CVID_RF_TYPE(version) == RF_TYPE_2T2R) ? true : false)



#endif