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

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

staging: r8188eu: Simplify code related to SupportICType 



This member of struct odm_dm_struct is always set to ODM_RTL8188E for this
driver. Accordingly, the code can be simplified. A number of routines
now are no longer needed and are deleted.

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

drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c

+1 −3
Original line number Diff line number Diff line
@@ -529,8 +529,6 @@ ODM_RASupport_Init( 
{

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("=====>ODM_RASupport_Init()\n"));



	/*  2012/02/14 MH Be noticed, the init must be after IC type is recognized!!!!! */

	if (dm_odm->SupportICType == ODM_RTL8188E)

	dm_odm->RaSupport88E = true;

}

drivers/staging/rtl8188eu/hal/odm.c

+114 −501

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8188eu/hal/odm_HWConfig.c

+74 −144

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8188eu/hal/odm_RTL8188E.c

+1 −4
Original line number Diff line number Diff line
@@ -184,9 +184,6 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct *dm_odm) 


void ODM_AntennaDiversityInit_88E(struct odm_dm_struct *dm_odm)

{

	if (dm_odm->SupportICType != ODM_RTL8188E)

		return;



	ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("dm_odm->AntDivType=%d\n", dm_odm->AntDivType));

	ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("dm_odm->bIsMPChip=%s\n", (dm_odm->bIsMPChip ? "true" : "false")));
@@ -349,7 +346,7 @@ void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm) 
	struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;

	struct adapter *adapter = dm_odm->Adapter;



	if ((dm_odm->SupportICType != ODM_RTL8188E) || (!(dm_odm->SupportAbility & ODM_BB_ANT_DIV)))

	if (!(dm_odm->SupportAbility & ODM_BB_ANT_DIV))

		return;

	if (!dm_odm->bLinked) {

		ODM_RT_TRACE(dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("ODM_AntennaDiversity_88E(): No Link.\n"));

drivers/staging/rtl8188eu/include/odm.h

+0 −2
Original line number Diff line number Diff line
@@ -1183,8 +1183,6 @@ void ODM_AntselStatistics_88C(struct odm_dm_struct *pDM_Odm, u8 MacId, 


void ODM_SingleDualAntennaDefaultSetting(struct odm_dm_struct *pDM_Odm);



bool ODM_SingleDualAntennaDetection(struct odm_dm_struct *pDM_Odm, u8 mode);



void odm_dtc(struct odm_dm_struct *pDM_Odm);



#endif