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

Commit fd50e119 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: remove FabVersion member of odm_dm_struct struct 



Value of this variable is hardcoded
and used only to produce debug output.
Probably, FabVersion is useless.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 29b9e168

drivers/staging/rtl8188eu/hal/odm.c

+0 −4
Original line number Diff line number Diff line
@@ -255,9 +255,6 @@ void ODM_CmnInfoInit(struct odm_dm_struct *pDM_Odm, enum odm_common_info_def Cmn 
	case	ODM_CMNINFO_CUT_VER:

		pDM_Odm->CutVersion = (u8)Value;

		break;

	case	ODM_CMNINFO_FAB_VER:

		pDM_Odm->FabVersion = (u8)Value;

		break;

	case	ODM_CMNINFO_RF_TYPE:

		pDM_Odm->RFType = (u8)Value;

		break;
@@ -477,7 +474,6 @@ void odm_CmnInfoInit_Debug(struct odm_dm_struct *pDM_Odm) 
	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportInterface=%d\n", pDM_Odm->SupportInterface));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("SupportICType=0x%x\n", pDM_Odm->SupportICType));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("CutVersion=%d\n", pDM_Odm->CutVersion));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("FabVersion=%d\n", pDM_Odm->FabVersion));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("RFType=%d\n", pDM_Odm->RFType));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("BoardType=%d\n", pDM_Odm->BoardType));

	ODM_RT_TRACE(pDM_Odm, ODM_COMP_COMMON, ODM_DBG_LOUD, ("ExtLNA=%d\n", pDM_Odm->ExtLNA));

drivers/staging/rtl8188eu/hal/rtl8188e_dm.c

+1 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter) 
	struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);

	struct dm_priv	*pdmpriv = &hal_data->dmpriv;

	struct odm_dm_struct *dm_odm = &(hal_data->odmpriv);

	u8 cut_ver, fab_ver;

	u8 cut_ver;



	/*  Init Value */

	memset(dm_odm, 0, sizeof(*dm_odm));
@@ -61,10 +61,8 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter) 


	ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_IC_TYPE, ODM_RTL8188E);



	fab_ver = ODM_TSMC;

	cut_ver = ODM_CUT_A;



	ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_FAB_VER, fab_ver);

	ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_CUT_VER, cut_ver);



	ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_MP_TEST_CHIP, hal_data->VersionID.ChipType == NORMAL_CHIP ? true : false);

drivers/staging/rtl8188eu/include/odm.h

+0 −9
Original line number Diff line number Diff line
@@ -348,7 +348,6 @@ enum odm_common_info_def { 
	ODM_CMNINFO_MP_TEST_CHIP,

	ODM_CMNINFO_IC_TYPE,		/* ODM_IC_TYPE_E */

	ODM_CMNINFO_CUT_VER,		/* ODM_CUT_VERSION_E */

	ODM_CMNINFO_FAB_VER,		/* ODM_FAB_E */

	ODM_CMNINFO_RF_TYPE,		/* ODM_RF_PATH_E or ODM_RF_TYPE_E? */

	ODM_CMNINFO_BOARD_TYPE,		/* ODM_BOARD_TYPE_E */

	ODM_CMNINFO_EXT_LNA,		/* true */
@@ -451,12 +450,6 @@ enum odm_cut_version { 
	ODM_CUT_TEST	=	7,

};



/*  ODM_CMNINFO_FAB_VER */

enum odm_fab_Version {

	ODM_TSMC	=	0,

	ODM_UMC		=	1,

};



/*  ODM_CMNINFO_RF_TYPE */

/*  For example 1T2R (A+AB = BIT0|BIT4|BIT5) */

enum odm_rf_path {
@@ -752,8 +745,6 @@ struct odm_dm_struct { 
	u32	SupportICType;

	/*  Cut Version TestChip/A-cut/B-cut... = 0/1/2/3/... */

	u8	CutVersion;

	/*  Fab Version TSMC/UMC = 0/1 */

	u8	FabVersion;

	/*  RF Type 4T4R/3T3R/2T2R/1T2R/1T1R/... */

	u8	RFType;

	/*  Board Type Normal/HighPower/MiniCard/SLIM/Combo/. = 0/1/2/3/4/. */