Skip to contentSkip to conversation

staging: rtl8723bs: remove unnecessary braces and fix indentation in HalPhyRf.c

PATCH In review Igor Putko 3 participants 7 messages May 24 – Jul 7 Staging

lore
Share & tools
lore

Igor Putko

author
#0 lore raw

PATCH 1/1 staging: rtl8723bs: remove unnecessary braces and fix indentation in HalPhyRf.c

Fixed braces around single statement blocks and corrected indentation to follow the Linux kernel coding style.

Signed-off-by Igor Putko <[email protected]>
---
 drivers/staging/rtl8723bs/hal/HalPhyRf.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf.c +4 -8
index 7bef05a9a..3b81bc2e2 100644
@@ -118,9 +118,8 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
 	}
 
 	/* Calculate Average ThermalValue after average enough times */
-	if (ThermalValue_AVG_count) {
+	if (ThermalValue_AVG_count)
 		ThermalValue = (u8)(ThermalValue_AVG / ThermalValue_AVG_count);
-	}
 
 	/* 4 5. Calculate delta, delta_LCK */
 	/* delta" here is used to determine whether thermal value changes or not. */

@@ -230,14 +229,11 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
 		/* else if (pDM_Odm->RFCalibrateInfo.CCK_index < 0) */
 			/* pDM_Odm->RFCalibrateInfo.CCK_index = 0; */
 	} else {
-			for (p = RF_PATH_A; p < c.RfPathCount; p++)
-				pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] = 0;
+		for (p = RF_PATH_A; p < c.RfPathCount; p++)
+			pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] = 0;
 	}
 
 	/* Print Swing base & current */
-	for (p = RF_PATH_A; p < c.RfPathCount; p++) {
-	}
-
 	if (
 		(pDM_Odm->RFCalibrateInfo.PowerIndexOffset[RF_PATH_A] != 0 ||
 		 pDM_Odm->RFCalibrateInfo.PowerIndexOffset[RF_PATH_B] != 0) &&

@@ -254,7 +250,7 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
 
 		if (ThermalValue > pHalData->EEPROMThermalMeter) {
 			for (p = RF_PATH_A; p < c.RfPathCount; p++)
-					(*c.ODM_TxPwrTrackSetPwr)(pDM_Odm, MIX_MODE, p, 0);
+				(*c.ODM_TxPwrTrackSetPwr)(pDM_Odm, MIX_MODE, p, 0);
 		} else {
 			for (p = RF_PATH_A; p < c.RfPathCount; p++)
 				(*c.ODM_TxPwrTrackSetPwr)(pDM_Odm, MIX_MODE, p, Indexforchannel);
Signature · 1 line
2.34.1
#1 lore raw
Quoted 2 lines · Igor Putko

Fixed braces around single statement blocks and corrected indentation to follow the Linux kernel coding style.

You're going to need to split this into multiple patches.

Quoted 4 lines
drivers/staging/rtl8723bs/hal/HalPhyRf.c +0 -0
@@ -230,14 +229,11 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
 		/* else if (pDM_Odm->RFCalibrateInfo.CCK_index < 0) */
 			/* pDM_Odm->RFCalibrateInfo.CCK_index = 0; */
 	} else {

drivers/staging/rtl8723bs/hal/HalPhyRf.c void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) · line 240

Quoted 10 lines
drivers/staging/rtl8723bs/hal/HalPhyRf.c +2 -5
-			for (p = RF_PATH_A; p < c.RfPathCount; p++)
-				pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] = 0;
+		for (p = RF_PATH_A; p < c.RfPathCount; p++)
+			pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] = 0;
 	}
 
 	/* Print Swing base & current */
-	for (p = RF_PATH_A; p < c.RfPathCount; p++) {
-	}
-

The comment makes no sense now.

drivers/staging/rtl8723bs/hal/HalPhyRf.c void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) · line 239

Quoted 3 lines
drivers/staging/rtl8723bs/hal/HalPhyRf.c +0 -0
 	if (
 		(pDM_Odm->RFCalibrateInfo.PowerIndexOffset[RF_PATH_A] != 0 ||
 		 pDM_Odm->RFCalibrateInfo.PowerIndexOffset[RF_PATH_B] != 0) &&

regards,
dan carpenter

author
#2 lore raw

PATCH 1/3 staging: rtl8723bs: remove empty loop and stale comment in HalPhyRf.c

The 'for' loop in ODM_TXPowerTrackingCallback_ThermalMeter performs no operations and just iterates over the path count. This is unnecessary code. Also, remove the associated "Print Swing base & current" comment, as it no longer refers to any active code.

Signed-off-by Igor Putko <[email protected]>
---
 drivers/staging/rtl8723bs/hal/HalPhyRf.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf.c +0 -4
index 7bef05a9a..f67b8d70b 100644
@@ -234,10 +234,6 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
 				pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] = 0;
 	}
 
-	/* Print Swing base & current */
-	for (p = RF_PATH_A; p < c.RfPathCount; p++) {
-	}
-
 	if (
 		(pDM_Odm->RFCalibrateInfo.PowerIndexOffset[RF_PATH_A] != 0 ||
 		 pDM_Odm->RFCalibrateInfo.PowerIndexOffset[RF_PATH_B] != 0) &&
Signature · 1 line
2.34.1
author
#3 lore raw

PATCH 2/3 staging: rtl8723bs: fix coding style for PowerIndexOffset initialization

Remove unnecessary braces around the single statement 'for' loop and fix indentation in ODM_TXPowerTrackingCallback_ThermalMeter to follow the Linux kernel coding style.

Signed-off-by Igor Putko <[email protected]>
---
 drivers/staging/rtl8723bs/hal/HalPhyRf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf.c +2 -2
index f67b8d70b..3d45e5e44 100644
@@ -230,8 +230,8 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
 		/* else if (pDM_Odm->RFCalibrateInfo.CCK_index < 0) */
 			/* pDM_Odm->RFCalibrateInfo.CCK_index = 0; */
 	} else {
-			for (p = RF_PATH_A; p < c.RfPathCount; p++)
-				pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] = 0;
+		for (p = RF_PATH_A; p < c.RfPathCount; p++)
+			pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] = 0;
 	}
 
 	if (
Signature · 1 line
2.34.1
maintainer
#4 lore raw

Re: [PATCH 2/3] staging: rtl8723bs: fix coding style for PowerIndexOffset initialization

Quoted 28 lines · Igor Putko

Remove unnecessary braces around the single statement 'for' loop and fix indentation in ODM_TXPowerTrackingCallback_ThermalMeter to follow the Linux kernel coding style.

Signed-off-by Igor Putko <[email protected]>
---
 drivers/staging/rtl8723bs/hal/HalPhyRf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf.c +2 -2
index f67b8d70b..3d45e5e44 100644
@@ -230,8 +230,8 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
 		/* else if (pDM_Odm->RFCalibrateInfo.CCK_index < 0) */
 			/* pDM_Odm->RFCalibrateInfo.CCK_index = 0; */
 	} else {
-			for (p = RF_PATH_A; p < c.RfPathCount; p++)
-				pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] = 0;
+		for (p = RF_PATH_A; p < c.RfPathCount; p++)
+			pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] = 0;
 	}
 
 	if (
Signature · 1 line
2.34.1

No braces were removed.

author
#5 lore raw

PATCH 3/3 staging: rtl8723bs: fix coding style for TxPwrTrackSetPwr calls

In reply to Igor Putko

Remove unnecessary braces and fix incorrect indentation for the loop calling ODM_TxPwrTrackSetPwr in ODM_TXPowerTrackingCallback_ThermalMeter.

Signed-off-by Igor Putko <[email protected]>
---
 drivers/staging/rtl8723bs/hal/HalPhyRf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/hal/HalPhyRf.c +1 -1
index 3d45e5e44..c7f3ad38f 100644
@@ -250,7 +250,7 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
 
 		if (ThermalValue > pHalData->EEPROMThermalMeter) {
 			for (p = RF_PATH_A; p < c.RfPathCount; p++)
-					(*c.ODM_TxPwrTrackSetPwr)(pDM_Odm, MIX_MODE, p, 0);
+				(*c.ODM_TxPwrTrackSetPwr)(pDM_Odm, MIX_MODE, p, 0);
 		} else {
 			for (p = RF_PATH_A; p < c.RfPathCount; p++)
 				(*c.ODM_TxPwrTrackSetPwr)(pDM_Odm, MIX_MODE, p, Indexforchannel);
Signature · 1 line
2.34.1
maintainer
#6 lore raw

Re: [PATCH 3/3] staging: rtl8723bs: fix coding style for TxPwrTrackSetPwr calls

Quoted 13 lines · Igor Putko

Remove unnecessary braces and fix incorrect indentation for the loop calling ODM_TxPwrTrackSetPwr in ODM_TXPowerTrackingCallback_ThermalMeter.

Signed-off-by Igor Putko <[email protected]>
---
 drivers/staging/rtl8723bs/hal/HalPhyRf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/hal/HalPhyRf.c +0 -0
index 3d45e5e44..c7f3ad38f 100644

drivers/staging/rtl8723bs/hal/HalPhyRf.c void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) · line 253

Quoted 5 lines
drivers/staging/rtl8723bs/hal/HalPhyRf.c +1 -1
@@ -250,7 +250,7 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
 
 		if (ThermalValue > pHalData->EEPROMThermalMeter) {
 			for (p = RF_PATH_A; p < c.RfPathCount; p++)
-					(*c.ODM_TxPwrTrackSetPwr)(pDM_Odm, MIX_MODE, p, 0);
+				(*c.ODM_TxPwrTrackSetPwr)(pDM_Odm, MIX_MODE, p, 0);

No braces were removed :(

Also you have a trailing space in your changelog text.

thanks,

greg k-h