[PATCH 0/8] staging: r8188eu: remove dead dynamic tx power code

[PATCH 0/8] staging: r8188eu: remove dead dynamic tx power code

[Michael Straube]

This series removes dynamic tx power related code that is not used in
this driver.

Tested on x86_64 with Inter-Tech DMG-02.

Michael Straube (8):
  staging: r8188eu: remove odm_DynamicTxPowerNIC()
  staging: r8188eu: remove odm_DynamicTxPowerAP()
  staging: r8188eu: remove odm_DynamicTxPower()
  staging: r8188eu: remove write-only fields from struct dm_priv
  staging: r8188eu: remove PowerIndex_backup from struct dm_priv
  staging: r8188eu: remove dead code from rtl8188e_rf6052.c
  staging: r8188eu: remove DynamicTxHighPowerLvl from struct dm_priv
  staging: r8188eu: remove odm_DynamicTxPowerInit()

 drivers/staging/r8188eu/hal/odm.c             | 59 -------------------
 drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 57 +++++-------------
 drivers/staging/r8188eu/include/odm_precomp.h |  4 --
 drivers/staging/r8188eu/include/rtl8188e_dm.h |  6 --
 4 files changed, 14 insertions(+), 112 deletions(-)

-- 
2.33.0

[PATCH 1/8] staging: r8188eu: remove odm_DynamicTxPowerNIC()

[Michael Straube]

Function odm_DynamicTxPowerNIC() does nothing, remove it.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/r8188eu/hal/odm.c             | 12 ------------
 drivers/staging/r8188eu/include/odm_precomp.h |  1 -
 2 files changed, 13 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 40eb1a938f8c..9fc36ec2f56c 100644
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -1207,7 +1207,6 @@ void odm_DynamicTxPower(struct odm_dm_struct *pDM_Odm)
 	switch	(pDM_Odm->SupportPlatform) {
 	case	ODM_MP:
 	case	ODM_CE:
-		odm_DynamicTxPowerNIC(pDM_Odm);
 		break;
 	case	ODM_AP:
 		odm_DynamicTxPowerAP(pDM_Odm);
@@ -1217,17 +1216,6 @@ void odm_DynamicTxPower(struct odm_dm_struct *pDM_Odm)
 	}
 }
 
-void odm_DynamicTxPowerNIC(struct odm_dm_struct *pDM_Odm)
-{
-	if (!(pDM_Odm->SupportAbility & ODM_BB_DYNAMIC_TXPWR))
-		return;
-
-	if (pDM_Odm->SupportICType == ODM_RTL8188E) {
-		/*  ??? */
-		/*  This part need to be redefined. */
-	}
-}
-
 void odm_DynamicTxPowerAP(struct odm_dm_struct *pDM_Odm)
 {
 }
diff --git a/drivers/staging/r8188eu/include/odm_precomp.h b/drivers/staging/r8188eu/include/odm_precomp.h
index cd8e3d2db212..91f74d694770 100644
--- a/drivers/staging/r8188eu/include/odm_precomp.h
+++ b/drivers/staging/r8188eu/include/odm_precomp.h
@@ -57,7 +57,6 @@ void odm_RefreshRateAdaptiveMask(struct odm_dm_struct *pDM_Odm);
 void odm_1R_CCA(struct odm_dm_struct *pDM_Odm);
 void odm_RefreshRateAdaptiveMaskCE(struct odm_dm_struct *pDM_Odm);
 void odm_RefreshRateAdaptiveMaskAPADSL(struct odm_dm_struct *pDM_Odm);
-void odm_DynamicTxPowerNIC(struct odm_dm_struct *pDM_Odm);
 void odm_DynamicTxPowerAP(struct odm_dm_struct *pDM_Odm);
 void odm_RSSIMonitorCheckMP(struct odm_dm_struct *pDM_Odm);
 void odm_RSSIMonitorCheckCE(struct odm_dm_struct *pDM_Odm);
-- 
2.33.0

[PATCH 2/8] staging: r8188eu: remove odm_DynamicTxPowerAP()

[Michael Straube]

Function odm_DynamicTxPowerAP() is empty, remove it.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/r8188eu/hal/odm.c             | 5 -----
 drivers/staging/r8188eu/include/odm_precomp.h | 1 -
 2 files changed, 6 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 9fc36ec2f56c..e39c79db7667 100644
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -1209,17 +1209,12 @@ void odm_DynamicTxPower(struct odm_dm_struct *pDM_Odm)
 	case	ODM_CE:
 		break;
 	case	ODM_AP:
-		odm_DynamicTxPowerAP(pDM_Odm);
 		break;
 	case	ODM_ADSL:
 		break;
 	}
 }
 
-void odm_DynamicTxPowerAP(struct odm_dm_struct *pDM_Odm)
-{
-}
-
 /* 3============================================================ */
 /* 3 RSSI Monitor */
 /* 3============================================================ */
diff --git a/drivers/staging/r8188eu/include/odm_precomp.h b/drivers/staging/r8188eu/include/odm_precomp.h
index 91f74d694770..1d6e93b13d7d 100644
--- a/drivers/staging/r8188eu/include/odm_precomp.h
+++ b/drivers/staging/r8188eu/include/odm_precomp.h
@@ -57,7 +57,6 @@ void odm_RefreshRateAdaptiveMask(struct odm_dm_struct *pDM_Odm);
 void odm_1R_CCA(struct odm_dm_struct *pDM_Odm);
 void odm_RefreshRateAdaptiveMaskCE(struct odm_dm_struct *pDM_Odm);
 void odm_RefreshRateAdaptiveMaskAPADSL(struct odm_dm_struct *pDM_Odm);
-void odm_DynamicTxPowerAP(struct odm_dm_struct *pDM_Odm);
 void odm_RSSIMonitorCheckMP(struct odm_dm_struct *pDM_Odm);
 void odm_RSSIMonitorCheckCE(struct odm_dm_struct *pDM_Odm);
 void odm_RSSIMonitorCheckAP(struct odm_dm_struct *pDM_Odm);
-- 
2.33.0

[PATCH 3/8] staging: r8188eu: remove odm_DynamicTxPower()

[Michael Straube]

Function odm_DynamicTxPower() does nothing, remove it.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/r8188eu/hal/odm.c             | 27 -------------------
 drivers/staging/r8188eu/include/odm_precomp.h |  1 -
 2 files changed, 28 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index e39c79db7667..c691a6a90fa9 100644
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -216,7 +216,6 @@ void ODM_DMWatchdog(struct odm_dm_struct *pDM_Odm)
 
 	ODM_TXPowerTrackingCheck(pDM_Odm);
 	odm_EdcaTurboCheck(pDM_Odm);
-	odm_DynamicTxPower(pDM_Odm);
 
 	odm_dtc(pDM_Odm);
 }
@@ -1189,32 +1188,6 @@ void odm_DynamicTxPowerInit(struct odm_dm_struct *pDM_Odm)
 	pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
 }
 
-void odm_DynamicTxPower(struct odm_dm_struct *pDM_Odm)
-{
-	/*  For AP/ADSL use struct rtl8192cd_priv * */
-	/*  For CE/NIC use struct adapter * */
-
-	if (!(pDM_Odm->SupportAbility & ODM_BB_DYNAMIC_TXPWR))
-		return;
-
-	/*  2012/01/12 MH According to Luke's suggestion, only high power will support the feature. */
-	if (!pDM_Odm->ExtPA)
-		return;
-
-	/*  2011/09/29 MH In HW integration first stage, we provide 4 different handle to operate */
-	/*  at the same time. In the stage2/3, we need to prive universal interface and merge all */
-	/*  HW dynamic mechanism. */
-	switch	(pDM_Odm->SupportPlatform) {
-	case	ODM_MP:
-	case	ODM_CE:
-		break;
-	case	ODM_AP:
-		break;
-	case	ODM_ADSL:
-		break;
-	}
-}
-
 /* 3============================================================ */
 /* 3 RSSI Monitor */
 /* 3============================================================ */
diff --git a/drivers/staging/r8188eu/include/odm_precomp.h b/drivers/staging/r8188eu/include/odm_precomp.h
index 1d6e93b13d7d..43f8e6849a45 100644
--- a/drivers/staging/r8188eu/include/odm_precomp.h
+++ b/drivers/staging/r8188eu/include/odm_precomp.h
@@ -49,7 +49,6 @@ void odm_RefreshRateAdaptiveMaskMP(struct odm_dm_struct *pDM_Odm);
 void odm_DynamicBBPowerSaving(struct odm_dm_struct *pDM_Odm);
 void odm_SwAntDivChkAntSwitch(struct odm_dm_struct *pDM_Odm, u8 Step);
 void odm_EdcaTurboCheck(struct odm_dm_struct *pDM_Odm);
-void odm_DynamicTxPower(struct odm_dm_struct *pDM_Odm);
 void odm_CommonInfoSelfInit(struct odm_dm_struct *pDM_Odm);
 void odm_SwAntDivInit(struct odm_dm_struct *pDM_Odm);
 void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm);
-- 
2.33.0

[PATCH 4/8] staging: r8188eu: remove write-only fields from struct dm_priv

[Michael Straube]

The fields bDynamicTxPowerEnable and LastDTPLvl of struct dm_priv
are set but never used. Remove them.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/r8188eu/hal/odm.c             | 2 --
 drivers/staging/r8188eu/include/rtl8188e_dm.h | 2 --
 2 files changed, 4 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index c691a6a90fa9..555060bdfdd9 100644
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -1183,8 +1183,6 @@ void odm_DynamicTxPowerInit(struct odm_dm_struct *pDM_Odm)
 	struct adapter *Adapter = pDM_Odm->Adapter;
 	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
 	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
-	pdmpriv->bDynamicTxPowerEnable = false;
-	pdmpriv->LastDTPLvl = TxHighPwrLevel_Normal;
 	pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
 }
 
diff --git a/drivers/staging/r8188eu/include/rtl8188e_dm.h b/drivers/staging/r8188eu/include/rtl8188e_dm.h
index 3ead20b321a9..2209975c0b2d 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_dm.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_dm.h
@@ -29,8 +29,6 @@ struct	dm_priv {
 	int	LastMinUndecoratedPWDBForDM;
 
 	/* for High Power */
-	u8 bDynamicTxPowerEnable;
-	u8 LastDTPLvl;
 	u8 DynamicTxHighPowerLvl;/* Tx Power Control for Near/Far Range */
 	u8	PowerIndex_backup[6];
 };
-- 
2.33.0

[PATCH 5/8] staging: r8188eu: remove PowerIndex_backup from struct dm_priv

[Michael Straube]

The field PowerIndex_backup of struct dm_priv is not used, remove it.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/r8188eu/include/rtl8188e_dm.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/r8188eu/include/rtl8188e_dm.h b/drivers/staging/r8188eu/include/rtl8188e_dm.h
index 2209975c0b2d..bfe300730c16 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_dm.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_dm.h
@@ -30,7 +30,6 @@ struct	dm_priv {
 
 	/* for High Power */
 	u8 DynamicTxHighPowerLvl;/* Tx Power Control for Near/Far Range */
-	u8	PowerIndex_backup[6];
 };
 
 void rtl8188e_init_dm_priv(struct adapter *adapt);
-- 
2.33.0

[PATCH 6/8] staging: r8188eu: remove dead code from rtl8188e_rf6052.c

[Michael Straube]

In this driver DynamicTxHighPowerLvl is set to TxHighPwrLevel_Normal
and never changed. In the file rtl8188e_rf6052.c there are some if
statements that check DynamicTxHighPowerLvl for other values than
TxHighPwrLevel_Normal. The code in the if blocks is never executed.
Remove the dead code.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 57 +++++--------------
 1 file changed, 14 insertions(+), 43 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
index edaa9a6dfdb1..946a1b97d96f 100644
--- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
@@ -85,7 +85,6 @@ rtl8188e_PHY_RF6052SetCckTxPower(
 		u8 *pPowerlevel)
 {
 	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
-	struct dm_priv *pdmpriv = &pHalData->dmpriv;
 	struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
 	u32 TxAGC[2] = {0, 0}, tmpval = 0, pwrtrac_value;
 	bool TurboScanOff = false;
@@ -112,34 +111,19 @@ rtl8188e_PHY_RF6052SetCckTxPower(
 			}
 		}
 	} else {
-		/* Driver dynamic Tx power shall not affect Tx power.
-		 * It shall be determined by power training mechanism.
-i		 *  Currently, we cannot fully disable driver dynamic
-		 * tx power mechanism because it is referenced by BT
-		 * coexist mechanism.
-		 * In the future, two mechanism shall be separated from
-		 * each other and maintained independently. */
-		if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level1) {
-			TxAGC[RF_PATH_A] = 0x10101010;
-			TxAGC[RF_PATH_B] = 0x10101010;
-		} else if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level2) {
-			TxAGC[RF_PATH_A] = 0x00000000;
-			TxAGC[RF_PATH_B] = 0x00000000;
-		} else {
-			for (idx1 = RF_PATH_A; idx1 <= RF_PATH_B; idx1++) {
-				TxAGC[idx1] =
-					pPowerlevel[idx1] | (pPowerlevel[idx1] << 8) |
-					(pPowerlevel[idx1] << 16) | (pPowerlevel[idx1] << 24);
-			}
-			if (pHalData->EEPROMRegulatory == 0) {
-				tmpval = (pHalData->MCSTxPowerLevelOriginalOffset[0][6]) +
-						(pHalData->MCSTxPowerLevelOriginalOffset[0][7] << 8);
-				TxAGC[RF_PATH_A] += tmpval;
-
-				tmpval = (pHalData->MCSTxPowerLevelOriginalOffset[0][14]) +
-						(pHalData->MCSTxPowerLevelOriginalOffset[0][15] << 24);
-				TxAGC[RF_PATH_B] += tmpval;
-			}
+		for (idx1 = RF_PATH_A; idx1 <= RF_PATH_B; idx1++) {
+			TxAGC[idx1] =
+				pPowerlevel[idx1] | (pPowerlevel[idx1] << 8) |
+				(pPowerlevel[idx1] << 16) | (pPowerlevel[idx1] << 24);
+		}
+		if (pHalData->EEPROMRegulatory == 0) {
+			tmpval = (pHalData->MCSTxPowerLevelOriginalOffset[0][6]) +
+					(pHalData->MCSTxPowerLevelOriginalOffset[0][7] << 8);
+			TxAGC[RF_PATH_A] += tmpval;
+
+			tmpval = (pHalData->MCSTxPowerLevelOriginalOffset[0][14]) +
+					(pHalData->MCSTxPowerLevelOriginalOffset[0][15] << 24);
+			TxAGC[RF_PATH_B] += tmpval;
 		}
 	}
 	for (idx1 = RF_PATH_A; idx1 <= RF_PATH_B; idx1++) {
@@ -207,7 +191,6 @@ static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel,
 				    u32 *pOutWriteVal)
 {
 	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
-	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
 	u8	i, chnlGroup = 0, pwr_diff_limit[4], customer_pwr_limit;
 	s8	pwr_diff = 0;
 	u32	writeVal, customer_limit, rf;
@@ -283,19 +266,7 @@ static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel,
 					((index < 2) ? powerBase0[rf] : powerBase1[rf]);
 			break;
 		}
-/*  20100427 Joseph: Driver dynamic Tx power shall not affect Tx power. It shall be determined by power training mechanism. */
-/*  Currently, we cannot fully disable driver dynamic tx power mechanism because it is referenced by BT coexist mechanism. */
-/*  In the future, two mechanism shall be separated from each other and maintained independently. Thanks for Lanhsin's reminder. */
-		/* 92d do not need this */
-		if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level1)
-			writeVal = 0x14141414;
-		else if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_Level2)
-			writeVal = 0x00000000;
-
-		/*  20100628 Joseph: High power mode for BT-Coexist mechanism. */
-		/*  This mechanism is only applied when Driver-Highpower-Mechanism is OFF. */
-		if (pdmpriv->DynamicTxHighPowerLvl == TxHighPwrLevel_BT1)
-			writeVal = writeVal - 0x06060606;
+
 		*(pOutWriteVal + rf) = writeVal;
 	}
 }
-- 
2.33.0

Re: [PATCH 6/8] staging: r8188eu: remove dead code from rtl8188e_rf6052.c

[Dan Carpenter]

On Tue, Sep 21, 2021 at 09:46:56PM +0200, Michael Straube wrote:
> In this driver DynamicTxHighPowerLvl is set to TxHighPwrLevel_Normal
> and never changed. In the file rtl8188e_rf6052.c there are some if
> statements that check DynamicTxHighPowerLvl for other values than
> TxHighPwrLevel_Normal. The code in the if blocks is never executed.
> Remove the dead code.
> 
> Signed-off-by: Michael Straube <straube.linux@gmail.com>
> ---
>  drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 57 +++++--------------
>  1 file changed, 14 insertions(+), 43 deletions(-)
> 
> diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
> index edaa9a6dfdb1..946a1b97d96f 100644
> --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
> +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
> @@ -85,7 +85,6 @@ rtl8188e_PHY_RF6052SetCckTxPower(
>  		u8 *pPowerlevel)
>  {
>  	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
> -	struct dm_priv *pdmpriv = &pHalData->dmpriv;
>  	struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
>  	u32 TxAGC[2] = {0, 0}, tmpval = 0, pwrtrac_value;
>  	bool TurboScanOff = false;
> @@ -112,34 +111,19 @@ rtl8188e_PHY_RF6052SetCckTxPower(
>  			}
>  		}
>  	} else {
> -		/* Driver dynamic Tx power shall not affect Tx power.
> -		 * It shall be determined by power training mechanism.
> -i		 *  Currently, we cannot fully disable driver dynamic
   ^

You're a vimster.  :)

regards,
dan carpenter

Re: [PATCH 6/8] staging: r8188eu: remove dead code from rtl8188e_rf6052.c

[Michael Straube]

On 9/23/21 09:29, Dan Carpenter wrote:
> On Tue, Sep 21, 2021 at 09:46:56PM +0200, Michael Straube wrote:
>> In this driver DynamicTxHighPowerLvl is set to TxHighPwrLevel_Normal
>> and never changed. In the file rtl8188e_rf6052.c there are some if
>> statements that check DynamicTxHighPowerLvl for other values than
>> TxHighPwrLevel_Normal. The code in the if blocks is never executed.
>> Remove the dead code.
>>
>> Signed-off-by: Michael Straube <straube.linux@gmail.com>
>> ---
>>   drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 57 +++++--------------
>>   1 file changed, 14 insertions(+), 43 deletions(-)
>>
>> diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
>> index edaa9a6dfdb1..946a1b97d96f 100644
>> --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
>> +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
>> @@ -85,7 +85,6 @@ rtl8188e_PHY_RF6052SetCckTxPower(
>>   		u8 *pPowerlevel)
>>   {
>>   	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
>> -	struct dm_priv *pdmpriv = &pHalData->dmpriv;
>>   	struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
>>   	u32 TxAGC[2] = {0, 0}, tmpval = 0, pwrtrac_value;
>>   	bool TurboScanOff = false;
>> @@ -112,34 +111,19 @@ rtl8188e_PHY_RF6052SetCckTxPower(
>>   			}
>>   		}
>>   	} else {
>> -		/* Driver dynamic Tx power shall not affect Tx power.
>> -		 * It shall be determined by power training mechanism.
>> -i		 *  Currently, we cannot fully disable driver dynamic
>     ^
> 
> You're a vimster.  :)
> 

Not really, actually this was part of the original code. ;)

Regards,
Michael

Re: [PATCH 6/8] staging: r8188eu: remove dead code from rtl8188e_rf6052.c

[Dan Carpenter]

On Thu, Sep 23, 2021 at 10:21:34AM +0200, Michael Straube wrote:
> On 9/23/21 09:29, Dan Carpenter wrote:
> > On Tue, Sep 21, 2021 at 09:46:56PM +0200, Michael Straube wrote:
> > > In this driver DynamicTxHighPowerLvl is set to TxHighPwrLevel_Normal
> > > and never changed. In the file rtl8188e_rf6052.c there are some if
> > > statements that check DynamicTxHighPowerLvl for other values than
> > > TxHighPwrLevel_Normal. The code in the if blocks is never executed.
> > > Remove the dead code.
> > > 
> > > Signed-off-by: Michael Straube <straube.linux@gmail.com>
> > > ---
> > >   drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 57 +++++--------------
> > >   1 file changed, 14 insertions(+), 43 deletions(-)
> > > 
> > > diff --git a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
> > > index edaa9a6dfdb1..946a1b97d96f 100644
> > > --- a/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
> > > +++ b/drivers/staging/r8188eu/hal/rtl8188e_rf6052.c
> > > @@ -85,7 +85,6 @@ rtl8188e_PHY_RF6052SetCckTxPower(
> > >   		u8 *pPowerlevel)
> > >   {
> > >   	struct hal_data_8188e *pHalData = GET_HAL_DATA(Adapter);
> > > -	struct dm_priv *pdmpriv = &pHalData->dmpriv;
> > >   	struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
> > >   	u32 TxAGC[2] = {0, 0}, tmpval = 0, pwrtrac_value;
> > >   	bool TurboScanOff = false;
> > > @@ -112,34 +111,19 @@ rtl8188e_PHY_RF6052SetCckTxPower(
> > >   			}
> > >   		}
> > >   	} else {
> > > -		/* Driver dynamic Tx power shall not affect Tx power.
> > > -		 * It shall be determined by power training mechanism.
> > > -i		 *  Currently, we cannot fully disable driver dynamic
> >     ^
> > 
> > You're a vimster.  :)
> > 
> 
> Not really, actually this was part of the original code. ;)

Huh...  Alright then.  Someone else was a vimster.  Good that you're
deleting their mistakes!

regards,
dan carpenter

[PATCH 7/8] staging: r8188eu: remove DynamicTxHighPowerLvl from struct dm_priv

[Michael Straube]

The field DynamicTxHighPowerLvl of struct dm_priv is set but never
used. Remove it and remove now unused variables from
odm_DynamicTxPowerInit().

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/r8188eu/hal/odm.c             | 4 ----
 drivers/staging/r8188eu/include/rtl8188e_dm.h | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 555060bdfdd9..87f0ea84819a 100644
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -1180,10 +1180,6 @@ bool ODM_RAStateCheck(struct odm_dm_struct *pDM_Odm, s32 RSSI, bool bForceUpdate
 
 void odm_DynamicTxPowerInit(struct odm_dm_struct *pDM_Odm)
 {
-	struct adapter *Adapter = pDM_Odm->Adapter;
-	struct hal_data_8188e	*pHalData = GET_HAL_DATA(Adapter);
-	struct dm_priv	*pdmpriv = &pHalData->dmpriv;
-	pdmpriv->DynamicTxHighPowerLvl = TxHighPwrLevel_Normal;
 }
 
 /* 3============================================================ */
diff --git a/drivers/staging/r8188eu/include/rtl8188e_dm.h b/drivers/staging/r8188eu/include/rtl8188e_dm.h
index bfe300730c16..a4399b119a74 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_dm.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_dm.h
@@ -27,9 +27,6 @@ struct	dm_priv {
 	int	EntryMaxUndecoratedSmoothedPWDB;
 	int	MinUndecoratedPWDBForDM;
 	int	LastMinUndecoratedPWDBForDM;
-
-	/* for High Power */
-	u8 DynamicTxHighPowerLvl;/* Tx Power Control for Near/Far Range */
 };
 
 void rtl8188e_init_dm_priv(struct adapter *adapt);
-- 
2.33.0

[PATCH 8/8] staging: r8188eu: remove odm_DynamicTxPowerInit()

[Michael Straube]

Function odm_DynamicTxPowerInit() is empty now, remove it.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
 drivers/staging/r8188eu/hal/odm.c             | 9 ---------
 drivers/staging/r8188eu/include/odm_precomp.h | 1 -
 2 files changed, 10 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 87f0ea84819a..e0784e38e083 100644
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -165,7 +165,6 @@ void ODM_DMInit(struct odm_dm_struct *pDM_Odm)
 
 	odm_PrimaryCCA_Init(pDM_Odm);    /*  Gary */
 	odm_DynamicBBPowerSavingInit(pDM_Odm);
-	odm_DynamicTxPowerInit(pDM_Odm);
 	odm_TXPowerTrackingInit(pDM_Odm);
 	ODM_EdcaTurboInit(pDM_Odm);
 	ODM_RAInfo_Init_all(pDM_Odm);
@@ -1174,14 +1173,6 @@ bool ODM_RAStateCheck(struct odm_dm_struct *pDM_Odm, s32 RSSI, bool bForceUpdate
 	return false;
 }
 
-/* 3============================================================ */
-/* 3 Dynamic Tx Power */
-/* 3============================================================ */
-
-void odm_DynamicTxPowerInit(struct odm_dm_struct *pDM_Odm)
-{
-}
-
 /* 3============================================================ */
 /* 3 RSSI Monitor */
 /* 3============================================================ */
diff --git a/drivers/staging/r8188eu/include/odm_precomp.h b/drivers/staging/r8188eu/include/odm_precomp.h
index 43f8e6849a45..6b3800894bc6 100644
--- a/drivers/staging/r8188eu/include/odm_precomp.h
+++ b/drivers/staging/r8188eu/include/odm_precomp.h
@@ -36,7 +36,6 @@
 void odm_DIGInit(struct odm_dm_struct *pDM_Odm);
 void odm_RateAdaptiveMaskInit(struct odm_dm_struct *pDM_Odm);
 void odm_DynamicBBPowerSavingInit(struct odm_dm_struct *pDM_Odm);
-void odm_DynamicTxPowerInit(struct odm_dm_struct *pDM_Odm);
 void odm_TXPowerTrackingInit(struct odm_dm_struct *pDM_Odm);
 void ODM_EdcaTurboInit(struct odm_dm_struct *pDM_Odm);
 void odm_SwAntDivInit_NIC(struct odm_dm_struct *pDM_Odm);
-- 
2.33.0