Commit bf952515 authored by Vatika Harlalka's avatar Vatika Harlalka Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8188eu: Reduce line size to increase readability 



Reduce line size to increase readability.

Signed-off-by: default avatarVatika Harlalka <vatikaharlalka@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 153fe946

drivers/staging/rtl8188eu/hal/Hal8188ERateAdaptive.c

+34 −16
Original line number Diff line number Diff line
@@ -115,17 +115,21 @@ static void odm_SetTxRPTTiming_8188E( 
	}

	pRaInfo->RptTime = DynamicTxRPTTiming[idx];



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

	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)

static int odm_RateDown_8188E(struct odm_dm_struct *dm_odm,

				struct odm_ra_info *pRaInfo)

{

	u8 RateID, LowestRate, HighestRate;

	u8 i;



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

	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"));

		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

				("odm_RateDown_8188E(): pRaInfo is NULL\n"));

		return -1;

	}

	RateID = pRaInfo->PreRate;
@@ -167,10 +171,15 @@ 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"));

	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;

}
@@ -182,9 +191,11 @@ 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"));

	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"));

		ODM_RT_TRACE(dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,

				("odm_RateUp_8188E(): pRaInfo is NULL\n"));

		return -1;

	}

	RateID = pRaInfo->PreRate;
@@ -200,7 +211,8 @@ 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"));

	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++) {
@@ -218,15 +230,20 @@ static int odm_RateUp_8188E( 
		RateID = HighestRate;

	}

RateUpfinish:

	if (pRaInfo->RAWaitingCounter == (4+PendingForRateUpFail[pRaInfo->RAPendingCounter]))

	if (pRaInfo->RAWaitingCounter ==

		(4+PendingForRateUpFail[pRaInfo->RAPendingCounter]))

		pRaInfo->RAWaitingCounter = 0;

	else

		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"));

	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;

}
@@ -247,7 +264,8 @@ 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"));

	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)) ||