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

Commit 3c71dd6c authored by Jakub Sitnicki's avatar Jakub Sitnicki Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: remove RFtype from struct HAL_VERSION 



RFtype in struct HAL_VERSION duplicates rf_type in struct
hal_data_8188e, and does not change.  Remove it and the macros that test
it.

Signed-off-by: default avatarJakub Sitnicki <jsitnicki@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e827aeed

drivers/staging/rtl8188eu/hal/hal_com.c

+1 −11
Original line number Diff line number Diff line
@@ -49,17 +49,7 @@ void dump_chip_info(struct HAL_VERSION chip_vers) 
	else

		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);



	pr_info("%s", buf);

drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c

+2 −13
Original line number Diff line number Diff line
@@ -138,8 +138,6 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter) 


	value32 = usb_read32(padapter, REG_SYS_CFG);

	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) */
@@ -148,17 +146,8 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter) 
	dump_chip_info(ChipVersion);



	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/rtl8188eu/include/HalVerDef.h

+0 −21
Original line number Diff line number Diff line
@@ -41,28 +41,15 @@ enum HAL_VENDOR { 
	CHIP_VENDOR_UMC		=	1,

};



enum HAL_RF_TYPE {

	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 {

	enum HAL_CHIP_TYPE	ChipType;

	enum HAL_CUT_VERSION	CUTVersion;

	enum HAL_VENDOR		VendorType;

	enum HAL_RF_TYPE	RFType;

	u8			ROMVer;

};



/*  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)
@@ -95,12 +82,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