Commit 62900ebf authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Remove a pile of fluff for calling into a bunch of no-op functions 



The whole antenna diversity selection was completely pointless as all
the end functions called were no-ops.

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36cf7c75

drivers/staging/rtl8723au/hal/odm.c

+0 −77
Original line number Diff line number Diff line
@@ -208,18 +208,6 @@ void odm_RSSIMonitorCheck23aAP(struct dm_odm_t *pDM_Odm); 
void odm_RSSIMonitorCheck23a(struct dm_odm_t *pDM_Odm);

void odm_DynamicTxPower23a(struct dm_odm_t *pDM_Odm);



void odm_SwAntDivInit(struct dm_odm_t *pDM_Odm);



void odm_SwAntDivInit_NIC(struct dm_odm_t *pDM_Odm);



void odm_SwAntDivChkAntSwitch(struct dm_odm_t *pDM_Odm, u8 Step);



void odm_SwAntDivChkAntSwitchNIC(struct dm_odm_t *pDM_Odm,

		u8 Step

	);



void odm_SwAntDivChkAntSwitchCallback23a(unsigned long data);



void odm_RefreshRateAdaptiveMask23a(struct dm_odm_t *pDM_Odm);



void ODM_TXPowerTrackingCheck23a(struct dm_odm_t *pDM_Odm);
@@ -242,8 +230,6 @@ static void ODM_EdcaTurboInit23a(struct dm_odm_t *pDM_Odm); 
#define		RxDefaultAnt1		0x65a9

#define	RxDefaultAnt2		0x569a



void odm_InitHybridAntDiv23a(struct dm_odm_t *pDM_Odm);



bool odm_StaDefAntSel(struct dm_odm_t *pDM_Odm,

 u32 OFDM_Ant1_Cnt,

 u32 OFDM_Ant2_Cnt,
@@ -257,8 +243,6 @@ void odm_SetRxIdleAnt(struct dm_odm_t *pDM_Odm, 
   bool   bDualPath

);



void odm_HwAntDiv23a(struct dm_odm_t *pDM_Odm);



/* 3 Export Interface */



/*  2011/09/21 MH Add to describe different team necessary resource allocate?? */
@@ -274,12 +258,6 @@ void ODM23a_DMInit(struct dm_odm_t *pDM_Odm) 
	odm_DynamicTxPower23aInit(pDM_Odm);

	odm_TXPowerTrackingInit23a(pDM_Odm);

	ODM_EdcaTurboInit23a(pDM_Odm);

	if ((pDM_Odm->AntDivType == CG_TRX_HW_ANTDIV)	||

	    (pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV)	||

	    (pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV))

		odm_InitHybridAntDiv23a(pDM_Odm);

	else if (pDM_Odm->AntDivType == CGCS_RX_SW_ANTDIV)

		odm_SwAntDivInit(pDM_Odm);

}



/*  2011/09/20 MH This is the entry pointer for all team to execute HW out source DM. */
@@ -317,12 +295,6 @@ void ODM_DMWatchdog23a(struct rtw_adapter *adapter) 
	odm_RefreshRateAdaptiveMask23a(pDM_Odm);



	odm_DynamicBBPowerSaving23a(pDM_Odm);

	if ((pDM_Odm->AntDivType ==  CG_TRX_HW_ANTDIV)	||

	    (pDM_Odm->AntDivType == CGCS_RX_HW_ANTDIV)	||

	    (pDM_Odm->AntDivType == CG_TRX_SMART_ANTDIV))

		odm_HwAntDiv23a(pDM_Odm);

	else if (pDM_Odm->AntDivType == CGCS_RX_SW_ANTDIV)

		odm_SwAntDivChkAntSwitch(pDM_Odm, SWAW_STEP_PEAK);



	ODM_TXPowerTrackingCheck23a(pDM_Odm);

	odm_EdcaTurboCheck23a(pDM_Odm);
@@ -365,9 +337,6 @@ void ODM_CmnInfoInit23a(struct dm_odm_t *pDM_Odm, 
	case	ODM_CMNINFO_RF_TYPE:

		pDM_Odm->RFType = (u8)Value;

		break;

	case    ODM_CMNINFO_RF_ANTENNA_TYPE:

		pDM_Odm->AntDivType = (u8)Value;

		break;

	case	ODM_CMNINFO_BOARD_TYPE:

		pDM_Odm->BoardType = (u8)Value;

		break;
@@ -467,8 +436,6 @@ void odm_CommonInfoSelfInit23a(struct dm_odm_t *pDM_Odm 
		(bool) ODM_GetBBReg(pDM_Odm, rFPGA0_XA_HSSIParameter2, BIT(9));

	pDM_Odm->RFPathRxEnable =

		(u8) ODM_GetBBReg(pDM_Odm, rOFDM0_TRxPathEnable, 0x0F);

	if (pDM_Odm->SupportICType & ODM_RTL8723A)

		pDM_Odm->AntDivType = CGCS_RX_SW_ANTDIV;



	ODM_InitDebugSetting23a(pDM_Odm);

}
@@ -1463,50 +1430,6 @@ void odm_TXPowerTrackingCheckAP(struct dm_odm_t *pDM_Odm) 
{

}



/* antenna mapping info */

/*  1: right-side antenna */

/*  2/0: left-side antenna */

/* PpDM_SWAT_Table->CCK_Ant1_Cnt /OFDM_Ant1_Cnt:  for right-side antenna:   Ant:1    RxDefaultAnt1 */

/* PpDM_SWAT_Table->CCK_Ant2_Cnt /OFDM_Ant2_Cnt:  for left-side antenna:     Ant:0    RxDefaultAnt2 */

/*  We select left antenna as default antenna in initial process, modify it as needed */

/*  */



/* 3 ============================================================ */

/* 3 SW Antenna Diversity */

/* 3 ============================================================ */

void odm_SwAntDivInit(struct dm_odm_t *pDM_Odm)

{

}



void ODM_SwAntDivChkPerPktRssi(struct dm_odm_t *pDM_Odm, u8 StationID,

			       struct phy_info *pPhyInfo)

{

}



void odm_SwAntDivChkAntSwitch(struct dm_odm_t *pDM_Odm, u8 Step)

{

}



void ODM_SwAntDivRestAfterLink(struct dm_odm_t *pDM_Odm)

{

}



void odm_SwAntDivChkAntSwitchCallback23a(unsigned long data)

{

}



/* 3 ============================================================ */

/* 3 SW Antenna Diversity */

/* 3 ============================================================ */



void odm_InitHybridAntDiv23a(struct dm_odm_t *pDM_Odm)

{

}



void odm_HwAntDiv23a(struct dm_odm_t *pDM_Odm)

{

}



/* EDCA Turbo */

static void ODM_EdcaTurboInit23a(struct dm_odm_t *pDM_Odm)

{

drivers/staging/rtl8723au/hal/odm_HWConfig.c

+0 −2
Original line number Diff line number Diff line
@@ -401,8 +401,6 @@ static void ODM_PhyStatusQuery23a_92CSeries(struct dm_odm_t *pDM_Odm, 
					 pPhyStatus, pPktinfo);

	if (pDM_Odm->RSSI_test) {

		/*  Select the packets to do RSSI checking for antenna switching. */

		if (pPktinfo->bPacketToSelf || pPktinfo->bPacketBeacon)

			ODM_SwAntDivChkPerPktRssi(pDM_Odm, pPktinfo->StationID, pPhyInfo);

	} else {

		odm_Process_RSSIForDM(pDM_Odm, pPhyInfo, pPktinfo);

	}

drivers/staging/rtl8723au/include/odm.h

+0 −9
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ struct dig_t { 
	bool		bMediaConnect_0;

	bool		bMediaConnect_1;



	u32		AntDiv_RSSI_max;

	u32		RSSI_max;

};
@@ -670,7 +669,6 @@ struct dm_odm_t { 


	bool			bDualMacSmartConcurrent;

	u32			BK_SupportAbility;

	u8			AntDivType;

/* HOOK BEFORE REG INIT----------- */



	/*  */
@@ -952,9 +950,6 @@ void ODM_SetAntenna(struct dm_odm_t *pDM_Odm, u8 Antenna); 
#define dm_RF_Saving	ODM_RF_Saving23a

void ODM_RF_Saving23a(struct dm_odm_t *pDM_Odm, u8 bForceInNormal);



#define SwAntDivRestAfterLink	ODM_SwAntDivRestAfterLink

void ODM_SwAntDivRestAfterLink(struct dm_odm_t *pDM_Odm);



#define dm_CheckTXPowerTracking		ODM_TXPowerTrackingCheck23a

void ODM_TXPowerTrackingCheck23a(struct dm_odm_t *pDM_Odm);
@@ -962,10 +957,6 @@ bool ODM_RAStateCheck23a(struct dm_odm_t *pDM_Odm, s32 RSSI, bool bForceUpdate, 
		      u8 *pRATRState);





#define dm_SWAW_RSSI_Check	ODM_SwAntDivChkPerPktRssi

void ODM_SwAntDivChkPerPktRssi(struct dm_odm_t *pDM_Odm, u8 StationID,

			       struct phy_info *pPhyInfo);



u32 ConvertTo_dB23a(u32 Value);



u32 GetPSDData(struct dm_odm_t *pDM_Odm, unsigned int point, u8 initial_gain_psd);