Commit 17a430a0 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove IS_1T1R, IS_1T2R, IS_2T2R macros 



In this driver RFType is RF_TYPE_1T1R, so only the macro IS_1T1R
returns true. Remove the macros and adjust related code accordingly.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210917080615.25819-2-straube.linux@gmail.com


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

drivers/staging/r8188eu/hal/hal_com.c

+1 −9
Original line number Diff line number Diff line
@@ -34,15 +34,7 @@ void dump_chip_info(struct HAL_VERSION chip_vers) 
		cnt += sprintf((buf + cnt), "UNKNOWN_CUT(%d)_",

			       chip_vers.CUTVersion);



	if (IS_1T1R(chip_vers))

	cnt += sprintf((buf + cnt), "1T1R_");

	else if (IS_1T2R(chip_vers))

		cnt += sprintf((buf + cnt), "1T2R_");

	else if (IS_2T2R(chip_vers))

		cnt += sprintf((buf + cnt), "2T2R_");

	else

		cnt += sprintf((buf + cnt), "UNKNOWN_RFTYPE(%d)_",

			       chip_vers.RFType);



	cnt += sprintf((buf + cnt), "RomVer(%d)\n", chip_vers.ROMVer);

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+2 −10
Original line number Diff line number Diff line
@@ -1690,16 +1690,8 @@ void rtl8188e_read_chip_version(struct adapter *padapter) 


	pHalData->VersionID = ChipVersion;



	if (IS_1T2R(ChipVersion)) {

		pHalData->rf_type = RF_1T2R;

		pHalData->NumTotalRFPath = 2;

	} else if (IS_2T2R(ChipVersion)) {

		pHalData->rf_type = RF_2T2R;

		pHalData->NumTotalRFPath = 2;

	} else {

	pHalData->rf_type = RF_1T1R;

	pHalData->NumTotalRFPath = 1;

	}



	MSG_88E("RF_Type is %x!!\n", pHalData->rf_type);

}

drivers/staging/r8188eu/include/HalVerDef.h

+0 −9
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ struct HAL_VERSION { 


/*  Get element */

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

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

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

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

#define GET_CVID_ROM_VERSION(version)	(((version).ROMVer) & ROM_VERSION_MASK)
@@ -77,12 +76,4 @@ struct HAL_VERSION { 
#define IS_CHIP_VENDOR_UMC(version)			\

	((GET_CVID_MANUFACTUER(version) == CHIP_VENDOR_UMC) ? 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