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

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

staging: rtl8188eu: remove ROMVer from struct HAL_VERSION 



ROM version on RTL8188EU is always 0.

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

drivers/staging/rtl8188eu/hal/hal_com.c

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

			       chip_vers.CUTVersion);

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

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

	cnt += sprintf((buf+cnt), "RomVer(0)\n");



	pr_info("%s", buf);

}

drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c

+0 −2
Original line number Diff line number Diff line
@@ -141,8 +141,6 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter) 
	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) */



	ChipVersion.ROMVer = 0;	/*  ROM code version. */



	dump_chip_info(ChipVersion);



	pHalData->VersionID = ChipVersion;

drivers/staging/rtl8188eu/include/HalVerDef.h

+0 −2
Original line number Diff line number Diff line
@@ -45,14 +45,12 @@ struct HAL_VERSION { 
	enum HAL_CHIP_TYPE	ChipType;

	enum HAL_CUT_VERSION	CUTVersion;

	enum HAL_VENDOR		VendorType;

	u8			ROMVer;

};



/*  Get element */

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

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



/* Common Macro. -- */

/* HAL_VERSION VersionID */