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

Commit f395036d authored by Larry Finger's avatar Larry Finger Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Additional cleanup of include/odm.h 



This driver only works with the USB bus. Accordingly, enum odm_interface_def
can be removed along with all code that uses ODM_ITRF_XXX, where XXX is not USB.

In enum odm_ic_type, only ODM_RTL8188E is used. Remove the enum, all references
to the others, and define the needed value.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e02a0089

drivers/staging/rtl8188eu/hal/odm.c

+1 −11
Original line number Diff line number Diff line
@@ -206,18 +206,8 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm) 
	odm_FalseAlarmCounterStatistics(pDM_Odm);

	odm_RSSIMonitorCheck(pDM_Odm);



	/* For CE Platform(SPRD or Tablet) */

	/* 8723A or 8189ES platform */

	/* NeilChen--2012--08--24-- */

	/* Fix Leave LPS issue */

	if ((pDM_Odm->Adapter->pwrctrlpriv.pwr_mode != PS_MODE_ACTIVE) &&/*  in LPS mode */

	    (pDM_Odm->SupportInterface  == ODM_ITRF_SDIO)) {

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("----Step1: odm_DIG is in LPS mode\n"));

		ODM_RT_TRACE(pDM_Odm, ODM_COMP_DIG, ODM_DBG_LOUD, ("---Step2: 8723AS is in LPS mode\n"));

		odm_DIGbyRSSI_LPS(pDM_Odm);

	} else {

	odm_DIG(pDM_Odm);

	}

	odm_CCKPacketDetectionThresh(pDM_Odm);



	if (*(pDM_Odm->pbPowerSaving))

drivers/staging/rtl8188eu/hal/odm_HWConfig.c

+16 −19
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ static s32 odm_SignalScaleMapping_92CSeries(struct odm_dm_struct *dm_odm, s32 Cu 
{

	s32 RetSig = 0;



	if ((dm_odm->SupportInterface  == ODM_ITRF_USB) ||

	    (dm_odm->SupportInterface  == ODM_ITRF_SDIO)) {

	if (CurrSig >= 51 && CurrSig <= 100)

		RetSig = 100;

	else if (CurrSig >= 41 && CurrSig <= 50)
@@ -61,7 +59,6 @@ static s32 odm_SignalScaleMapping_92CSeries(struct odm_dm_struct *dm_odm, s32 Cu 
		RetSig = 6 + (((CurrSig - 1) * 3) / 2);

	else

		RetSig = CurrSig;

	}

	return RetSig;

}

drivers/staging/rtl8188eu/hal/rtl8188e_dm.c

+1 −4
Original line number Diff line number Diff line
@@ -63,9 +63,6 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter) 


	ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_PLATFORM, ODM_CE);



	if (Adapter->interface_type == RTW_GSPI)

		ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_INTERFACE, ODM_ITRF_SDIO);

	else

	ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_INTERFACE, Adapter->interface_type);/* RTL871X_HCI_TYPE */



	ODM_CmnInfoInit(dm_odm, ODM_CMNINFO_IC_TYPE, ODM_RTL8188E);

drivers/staging/rtl8188eu/include/odm.h

+1 −23
Original line number Diff line number Diff line
@@ -454,29 +454,7 @@ enum odm_ability_def { 
	ODM_RF_CALIBRATION		= BIT26,

};



/* 	ODM_CMNINFO_INTERFACE */

enum odm_interface_def {

	ODM_ITRF_PCIE	=	0x1,

	ODM_ITRF_USB	=	0x2,

	ODM_ITRF_SDIO	=	0x4,

	ODM_ITRF_ALL	=	0x7,

};



/*  ODM_CMNINFO_IC_TYPE */

enum odm_ic_type {

	ODM_RTL8192S	=	BIT0,

	ODM_RTL8192C	=	BIT1,

	ODM_RTL8192D	=	BIT2,

	ODM_RTL8723A	=	BIT3,

	ODM_RTL8188E	=	BIT4,

	ODM_RTL8812	=	BIT5,

	ODM_RTL8821	=	BIT6,

};



#define ODM_IC_11N_SERIES						\

	(ODM_RTL8192S | ODM_RTL8192C | ODM_RTL8192D |			\

	 ODM_RTL8723A | ODM_RTL8188E)

#define ODM_IC_11AC_SERIES		(ODM_RTL8812)

#define ODM_RTL8188E		BIT4



/* ODM_CMNINFO_CUT_VER */

enum odm_cut_version {

drivers/staging/rtl8188eu/include/odm_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ ODM_REG(DIG,_pDM_Odm) 


#define _cat(_name, _ic_type, _func)					\

	(								\

		((_ic_type) & ODM_IC_11N_SERIES) ? _func##_11N(_name) :	\

		(_ic_type) ? _func##_11N(_name) :			\

		_func##_11AC(_name)					\

	)