Commit 8bde3b8a authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove ODM_RT_TRACE calls from hal/Hal8188ERateAdaptive.c 



Remove ODM_RT_TRACE calls from hal/Hal8188ERateAdaptive.c, as by removing
these calls in this file and others, we can ultimately then remove the
macro definition itself, which does not follow best practice.

Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210731003937.68615-7-phil@philpotter.co.uk


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8362f65a

drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c

+2 −97
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ static void odm_SetTxRPTTiming_8188E( 
			idx -= 1;

	}

	pRaInfo->RptTime = DynamicTxRPTTiming[idx];



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("pRaInfo->RptTime = 0x%x\n", pRaInfo->RptTime));

}



static int odm_RateDown_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_info *pRaInfo)
@@ -122,18 +120,12 @@ static int odm_RateDown_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_info * 
	u8 RateID, LowestRate, HighestRate;

	u8 i;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("=====>odm_RateDown_8188E()\n"));

	if (NULL == pRaInfo) {

		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("odm_RateDown_8188E(): pRaInfo is NULL\n"));

	if (NULL == pRaInfo)

		return -1;

	}

	RateID = pRaInfo->PreRate;

	LowestRate = pRaInfo->LowestRate;

	HighestRate = pRaInfo->HighestRate;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     (" RateID =%d LowestRate =%d HighestRate =%d RateSGI =%d\n",

		     RateID, LowestRate, HighestRate, pRaInfo->RateSGI));

	if (RateID > HighestRate) {

		RateID = HighestRate;

	} else if (pRaInfo->RateSGI) {
@@ -166,10 +158,6 @@ static int odm_RateDown_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_info * 


	pRaInfo->DecisionRate = RateID;

	odm_SetTxRPTTiming_8188E(dm_odm, pRaInfo, 2);

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("Rate down, RPT Timing default\n"));

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("RAWaitingCounter %d, RAPendingCounter %d", pRaInfo->RAWaitingCounter, pRaInfo->RAPendingCounter));

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("Rate down to RateID %d RateSGI %d\n", RateID, pRaInfo->RateSGI));

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<===== odm_RateDown_8188E()\n"));

	return 0;

}
@@ -181,16 +169,10 @@ static int odm_RateUp_8188E( 
	u8 RateID, HighestRate;

	u8 i;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("=====>odm_RateUp_8188E()\n"));

	if (NULL == pRaInfo) {

		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("odm_RateUp_8188E(): pRaInfo is NULL\n"));

	if (NULL == pRaInfo)

		return -1;

	}

	RateID = pRaInfo->PreRate;

	HighestRate = pRaInfo->HighestRate;

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     (" RateID =%d HighestRate =%d\n",

		     RateID, HighestRate));

	if (pRaInfo->RAWaitingCounter == 1) {

		pRaInfo->RAWaitingCounter = 0;

		pRaInfo->RAPendingCounter = 0;
@@ -199,7 +181,6 @@ static int odm_RateUp_8188E( 
		goto RateUpfinish;

	}

	odm_SetTxRPTTiming_8188E(dm_odm, pRaInfo, 0);

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("odm_RateUp_8188E():Decrease RPT Timing\n"));



	if (RateID < HighestRate) {

		for (i = RateID+1; i <= HighestRate; i++) {
@@ -223,9 +204,6 @@ static int odm_RateUp_8188E( 
		pRaInfo->RAWaitingCounter++;



	pRaInfo->DecisionRate = RateID;

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("Rate up to RateID %d\n", RateID));

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("RAWaitingCounter %d, RAPendingCounter %d", pRaInfo->RAWaitingCounter, pRaInfo->RAPendingCounter));

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<===== odm_RateUp_8188E()\n"));

	return 0;

}
@@ -246,8 +224,6 @@ static void odm_RateDecision_8188E(struct odm_dm_struct *dm_odm, 
	/* u32 pool_retry; */

	static u8 DynamicTxRPTTimingCounter;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("=====>odm_RateDecision_8188E()\n"));



	if (pRaInfo->Active && (pRaInfo->TOTAL > 0)) { /*  STA used and data packet exits */

		if ((pRaInfo->RssiStaRA < (pRaInfo->PreRssiStaRA - 3)) ||

		    (pRaInfo->RssiStaRA > (pRaInfo->PreRssiStaRA + 3))) {
@@ -265,16 +241,11 @@ static void odm_RateDecision_8188E(struct odm_dm_struct *dm_odm, 
			RtyPtID = 1;

		PenaltyID1 = RETRY_PENALTY_IDX[RtyPtID][RateID]; /* TODO by page */



		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

			     (" NscDown init is %d\n", pRaInfo->NscDown));

		pRaInfo->NscDown += pRaInfo->RTY[0] * RETRY_PENALTY[PenaltyID1][0];

		pRaInfo->NscDown += pRaInfo->RTY[1] * RETRY_PENALTY[PenaltyID1][1];

		pRaInfo->NscDown += pRaInfo->RTY[2] * RETRY_PENALTY[PenaltyID1][2];

		pRaInfo->NscDown += pRaInfo->RTY[3] * RETRY_PENALTY[PenaltyID1][3];

		pRaInfo->NscDown += pRaInfo->RTY[4] * RETRY_PENALTY[PenaltyID1][4];

		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

			     (" NscDown is %d, total*penalty[5] is %d\n",

			     pRaInfo->NscDown, (pRaInfo->TOTAL * RETRY_PENALTY[PenaltyID1][5])));

		if (pRaInfo->NscDown > (pRaInfo->TOTAL * RETRY_PENALTY[PenaltyID1][5]))

			pRaInfo->NscDown -= pRaInfo->TOTAL * RETRY_PENALTY[PenaltyID1][5];

		else
@@ -282,24 +253,16 @@ static void odm_RateDecision_8188E(struct odm_dm_struct *dm_odm, 


		/*  rate up */

		PenaltyID2 = RETRY_PENALTY_UP_IDX[RateID];

		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

			     (" NscUp init is %d\n", pRaInfo->NscUp));

		pRaInfo->NscUp += pRaInfo->RTY[0] * RETRY_PENALTY[PenaltyID2][0];

		pRaInfo->NscUp += pRaInfo->RTY[1] * RETRY_PENALTY[PenaltyID2][1];

		pRaInfo->NscUp += pRaInfo->RTY[2] * RETRY_PENALTY[PenaltyID2][2];

		pRaInfo->NscUp += pRaInfo->RTY[3] * RETRY_PENALTY[PenaltyID2][3];

		pRaInfo->NscUp += pRaInfo->RTY[4] * RETRY_PENALTY[PenaltyID2][4];

		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

			     ("NscUp is %d, total*up[5] is %d\n",

			     pRaInfo->NscUp, (pRaInfo->TOTAL * RETRY_PENALTY[PenaltyID2][5])));

		if (pRaInfo->NscUp > (pRaInfo->TOTAL * RETRY_PENALTY[PenaltyID2][5]))

			pRaInfo->NscUp -= pRaInfo->TOTAL * RETRY_PENALTY[PenaltyID2][5];

		else

			pRaInfo->NscUp = 0;



		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE|ODM_COMP_INIT, ODM_DBG_LOUD,

			     (" RssiStaRa = %d RtyPtID =%d PenaltyID1 = 0x%x  PenaltyID2 = 0x%x RateID =%d NscDown =%d NscUp =%d SGI =%d\n",

			     pRaInfo->RssiStaRA, RtyPtID, PenaltyID1, PenaltyID2, RateID, pRaInfo->NscDown, pRaInfo->NscUp, pRaInfo->RateSGI));

		if ((pRaInfo->NscDown < N_THRESHOLD_LOW[RateID]) ||

		    (pRaInfo->DROP > DROPING_NECESSARY[RateID]))

			odm_RateDown_8188E(dm_odm, pRaInfo);
@@ -316,8 +279,6 @@ static void odm_RateDecision_8188E(struct odm_dm_struct *dm_odm, 


		if (DynamicTxRPTTimingCounter >= 4) {

			odm_SetTxRPTTiming_8188E(dm_odm, pRaInfo, 1);

			ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE,

				     ODM_DBG_LOUD, ("<===== Rate don't change 4 times, Extend RPT Timing\n"));

			DynamicTxRPTTimingCounter = 0;

		}
@@ -325,7 +286,6 @@ static void odm_RateDecision_8188E(struct odm_dm_struct *dm_odm, 


		odm_ResetRaCounter_8188E(pRaInfo);

	}

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, ("<===== odm_RateDecision_8188E()\n"));

}



static int odm_ARFBRefresh_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_info *pRaInfo)
@@ -405,15 +365,10 @@ static int odm_ARFBRefresh_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_inf 
			pRaInfo->PTModeSS = 1;

		else

			pRaInfo->PTModeSS = 0;

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("ODM_ARFBRefresh_8188E(): PTModeSS =%d\n", pRaInfo->PTModeSS));



	if (pRaInfo->DecisionRate > pRaInfo->HighestRate)

		pRaInfo->DecisionRate = pRaInfo->HighestRate;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("ODM_ARFBRefresh_8188E(): RateID =%d RateMask =%8.8x RAUseRate =%8.8x HighestRate =%d, DecisionRate =%d\n",

		     pRaInfo->RateID, pRaInfo->RateMask, pRaInfo->RAUseRate, pRaInfo->HighestRate, pRaInfo->DecisionRate));

	return 0;

}
@@ -510,15 +465,10 @@ odm_RATxRPTTimerSetting( 
		u16 minRptTime

)

{

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, (" =====>odm_RATxRPTTimerSetting()\n"));



	if (dm_odm->CurrminRptTime != minRptTime) {

		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

			     (" CurrminRptTime = 0x%04x minRptTime = 0x%04x\n", dm_odm->CurrminRptTime, minRptTime));

		rtw_rpt_timer_cfg_cmd(dm_odm->Adapter, minRptTime);

		dm_odm->CurrminRptTime = minRptTime;

	}

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE, (" <===== odm_RATxRPTTimerSetting()\n"));

}



void
@@ -526,8 +476,6 @@ ODM_RASupport_Init( 
		struct odm_dm_struct *dm_odm

	)

{

	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;
@@ -550,10 +498,6 @@ int ODM_RAInfo_Init(struct odm_dm_struct *dm_odm, u8 macid) 
			max_rate_idx = 0x03;

	}



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("ODM_RAInfo_Init(): WirelessMode:0x%08x , max_raid_idx:0x%02x\n",

		     WirelessMode, max_rate_idx));



	pRaInfo->DecisionRate = max_rate_idx;

	pRaInfo->PreRate = max_rate_idx;

	pRaInfo->HighestRate = max_rate_idx;
@@ -594,7 +538,6 @@ int ODM_RAInfo_Init_all(struct odm_dm_struct *dm_odm) 
{

	u8 macid = 0;



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

	dm_odm->CurrminRptTime = 0;



	for (macid = 0; macid < ODM_ASSOCIATE_ENTRY_NUM; macid++)
@@ -607,8 +550,6 @@ u8 ODM_RA_GetShortGI_8188E(struct odm_dm_struct *dm_odm, u8 macid) 
{

	if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))

		return 0;

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     ("macid =%d SGI =%d\n", macid, dm_odm->RAInfo[macid].RateSGI));

	return dm_odm->RAInfo[macid].RateSGI;

}
@@ -619,8 +560,6 @@ u8 ODM_RA_GetDecisionRate_8188E(struct odm_dm_struct *dm_odm, u8 macid) 
	if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))

		return 0;

	DecisionRate = (dm_odm->RAInfo[macid].DecisionRate);

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		(" macid =%d DecisionRate = 0x%x\n", macid, DecisionRate));

	return DecisionRate;

}
@@ -631,8 +570,6 @@ u8 ODM_RA_GetHwPwrStatus_8188E(struct odm_dm_struct *dm_odm, u8 macid) 
	if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))

		return 0;

	PTStage = (dm_odm->RAInfo[macid].PTStage);

	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     ("macid =%d PTStage = 0x%x\n", macid, PTStage));

	return PTStage;

}
@@ -640,9 +577,6 @@ void ODM_RA_UpdateRateInfo_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rate 
{

	struct odm_ra_info *pRaInfo = NULL;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("macid =%d RateID = 0x%x RateMask = 0x%x SGIEnable =%d\n",

		     macid, RateID, RateMask, SGIEnable));

	if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))

		return;
@@ -657,8 +591,6 @@ void ODM_RA_SetRSSI_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rssi) 
{

	struct odm_ra_info *pRaInfo = NULL;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_TRACE,

		     (" macid =%d Rssi =%d\n", macid, Rssi));

	if ((NULL == dm_odm) || (macid >= ASSOCIATE_ENTRY_NUM))

		return;
@@ -679,10 +611,6 @@ void ODM_RA_TxRPT2Handle_8188E(struct odm_dm_struct *dm_odm, u8 *TxRPT_Buf, u16 
	u32 valid = 0, ItemNum = 0;

	u16 minRptTime = 0x927c;



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

		     ("=====>ODM_RA_TxRPT2Handle_8188E(): valid0 =%d valid1 =%d BufferLength =%d\n",

		     macid_entry0, macid_entry1, TxRPT_Len));



	ItemNum = TxRPT_Len >> 3;

	pBuffer = TxRPT_Buf;
@@ -706,13 +634,6 @@ void ODM_RA_TxRPT2Handle_8188E(struct odm_dm_struct *dm_odm, u8 *TxRPT_Buf, u16 
					 pRAInfo->RTY[2] + pRAInfo->RTY[3] +

					 pRAInfo->RTY[4] + pRAInfo->DROP;

			if (pRAInfo->TOTAL != 0) {

				ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

					     ("macid =%d Total =%d R0 =%d R1 =%d R2 =%d R3 =%d R4 =%d D0 =%d valid0 =%x valid1 =%x\n",

					     MacId, pRAInfo->TOTAL,

					     pRAInfo->RTY[0], pRAInfo->RTY[1],

					     pRAInfo->RTY[2], pRAInfo->RTY[3],

					     pRAInfo->RTY[4], pRAInfo->DROP,

					     macid_entry0, macid_entry1));

				if (pRAInfo->PTActive) {

					if (pRAInfo->RAstage < 5)

						odm_RateDecision_8188E(dm_odm, pRAInfo);
@@ -729,20 +650,6 @@ void ODM_RA_TxRPT2Handle_8188E(struct odm_dm_struct *dm_odm, u8 *TxRPT_Buf, u16 
				} else {

					odm_RateDecision_8188E(dm_odm, pRAInfo);

				}

				ODM_RT_TRACE(dm_odm, ODM_COMP_INIT, ODM_DBG_LOUD,

					     ("macid =%d R0 =%d R1 =%d R2 =%d R3 =%d R4 =%d drop =%d valid0 =%x RateID =%d SGI =%d\n",

					     MacId,

					     pRAInfo->RTY[0],

					     pRAInfo->RTY[1],

					     pRAInfo->RTY[2],

					     pRAInfo->RTY[3],

					     pRAInfo->RTY[4],

					     pRAInfo->DROP,

					     macid_entry0,

					     pRAInfo->DecisionRate,

					     pRAInfo->RateSGI));

			} else {

				ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, (" TOTAL = 0!!!!\n"));

			}

		}
@@ -754,6 +661,4 @@ void ODM_RA_TxRPT2Handle_8188E(struct odm_dm_struct *dm_odm, u8 *TxRPT_Buf, u16 
	} while (MacId < ItemNum);



	odm_RATxRPTTimerSetting(dm_odm, minRptTime);



	ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("<===== ODM_RA_TxRPT2Handle_8188E()\n"));

}