Skip to contentSkip to conversation

staging: rtl8723bs: hal: Remove set but unused variables

PATCH New Fabio M. De Francesco 1 participant 3 messages May 14, 2021 Staging

lore
Share & tools
lore
#0 lore raw

v3 cover staging: rtl8723bs: hal: Remove set but unused variables

Removed set but unused variables. Issues detected by GCC while building for x86_64 (patch 1/2) and by the kernel test robot (patch 2/2) while building with GCC W=1 for target PowerPC.

Changes from v2: Corrected subjected lines that didn't match up with the patches. Issues reported by Greg K-H.
Changes from v1: Added patch 2/2 to remove an unused variable detected and reported by the kernel test robot.

Fabio M. De Francesco (2):
staging: rtl8723bs: hal: Remove three set but unused variables
staging: rtl8723bs: hal: Remove set but unused variable

 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)
Signature · 1 line
2.31.1
#1 lore raw

PATCH v3 1/2 staging: rtl8723bs: hal: Remove three set but unused variables

Removed three set but unused variables. Issue detected by GCC while building for x86_64.

---

Changes from v2: Rewrote the subject line.
Changes from v1: none.

 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +1 -13
index c42fd36c88ef..3b8be8137683 100644
@@ -1629,7 +1629,7 @@ void PHY_IQCalibrate_8723B(
 	s32 result[4][8];	/* last is final result */
 	u8 i, final_candidate;
 	bool bPathAOK, bPathBOK;
-	s32 RegE94, RegE9C, RegEA4, RegEAC, RegEB4, RegEBC, RegEC4, RegECC, RegTmp = 0;
+	s32 RegE94, RegE9C, RegEA4, RegEB4, RegEBC, RegEC4, RegTmp = 0;
 	bool is12simular, is13simular, is23simular;
 	bool bSingleTone = false, bCarrierSuppression = false;
 	u32 IQK_BB_REG_92C[IQK_BB_REG_NUM] = {
@@ -1646,7 +1646,6 @@ void PHY_IQCalibrate_8723B(
 /* 	u32 		Path_SEL_BB = 0; */
 	u32 		GNT_BT_default;
 	u32 		StartTime;
-	s32			ProgressingTime;
 
 	if (!ODM_CheckPowerStatus(padapter))
 		return;
@@ -1777,22 +1776,18 @@ void PHY_IQCalibrate_8723B(
 		RegE94 = result[i][0];
 		RegE9C = result[i][1];
 		RegEA4 = result[i][2];
-		RegEAC = result[i][3];
 		RegEB4 = result[i][4];
 		RegEBC = result[i][5];
 		RegEC4 = result[i][6];
-		RegECC = result[i][7];
 	}
 
 	if (final_candidate != 0xff) {
 		pDM_Odm->RFCalibrateInfo.RegE94 = RegE94 = result[final_candidate][0];
 		pDM_Odm->RFCalibrateInfo.RegE9C = RegE9C = result[final_candidate][1];
 		RegEA4 = result[final_candidate][2];
-		RegEAC = result[final_candidate][3];
 		pDM_Odm->RFCalibrateInfo.RegEB4 = RegEB4 = result[final_candidate][4];
 		pDM_Odm->RFCalibrateInfo.RegEBC = RegEBC = result[final_candidate][5];
 		RegEC4 = result[final_candidate][6];
-		RegECC = result[final_candidate][7];
 		bPathAOK = bPathBOK = true;
 	} else {
 		pDM_Odm->RFCalibrateInfo.RegE94 = pDM_Odm->RFCalibrateInfo.RegEB4 = 0x100;	/* X default value */
@@ -1844,10 +1839,6 @@ void PHY_IQCalibrate_8723B(
 	}
 
 	pDM_Odm->RFCalibrateInfo.bIQKInProgress = false;
-
-	ProgressingTime = jiffies_to_msecs(jiffies - StartTime);
-
-
 }
 
 
@@ -1856,7 +1847,6 @@ void PHY_LCCalibrate_8723B(struct dm_odm_t *pDM_Odm)
 	bool		bSingleTone = false, bCarrierSuppression = false;
 	u32 		timeout = 2000, timecount = 0;
 	u32 		StartTime;
-	s32			ProgressingTime;
 
 #if DISABLE_BB_RF
 	return;
@@ -1882,6 +1872,4 @@ void PHY_LCCalibrate_8723B(struct dm_odm_t *pDM_Odm)
 
 
 	pDM_Odm->RFCalibrateInfo.bLCKInProgress = false;
-
-	ProgressingTime = jiffies_to_msecs(jiffies - StartTime);
 }
Signature · 1 line
2.31.1
#2 lore raw

PATCH v3 2/2 staging: rtl8723bs: hal: Remove set but unused variable

In reply to Fabio M. De Francesco

Removed set but unused variable. Issue reported by kernel test robot building with GCC W=1 for PowerPC target architecture.

---

Changes from v2: Rewrote the subject line.
Changes from v1: Added this 2/2 to remove variables reported by KTR.

 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +0 -4
index 3b8be8137683..8b42b19cc089 100644
@@ -1645,7 +1645,6 @@ void PHY_IQCalibrate_8723B(
 	};
 /* 	u32 		Path_SEL_BB = 0; */
 	u32 		GNT_BT_default;
-	u32 		StartTime;
 
 	if (!ODM_CheckPowerStatus(padapter))
 		return;
@@ -1710,7 +1709,6 @@ void PHY_IQCalibrate_8723B(
 		_PHY_ReloadADDARegisters8723B(padapter, IQK_BB_REG_92C, pDM_Odm->RFCalibrateInfo.IQK_BB_backup_recover, 9);
 		return;
 	}
-	StartTime = jiffies;
 
 	/* save default GNT_BT */
 	GNT_BT_default = PHY_QueryBBReg(pDM_Odm->Adapter, 0x764, bMaskDWord);
@@ -1846,7 +1844,6 @@ void PHY_LCCalibrate_8723B(struct dm_odm_t *pDM_Odm)
 {
 	bool		bSingleTone = false, bCarrierSuppression = false;
 	u32 		timeout = 2000, timecount = 0;
-	u32 		StartTime;
 
 #if DISABLE_BB_RF
 	return;
@@ -1859,7 +1856,6 @@ void PHY_LCCalibrate_8723B(struct dm_odm_t *pDM_Odm)
 	if (bSingleTone || bCarrierSuppression)
 		return;
 
-	StartTime = jiffies;
 	while (*(pDM_Odm->pbScanInProcess) && timecount < timeout) {
 		mdelay(50);
 		timecount += 50;
Signature · 1 line
2.31.1