Skip to contentSkip to conversation

staging: rtl8723bs: fix line length and style issues

PATCH In review Mahad Ibrahim 2 participants 7 messages Jan 29 – Feb 7 Staging

lore
Share & tools
lore

Mahad Ibrahim

author
#0 lore raw

v3 cover staging: rtl8723bs: fix line length and style issues

This patch series fixes additional white space after "/*", as well as resending the previous commits.

Changes in v3:
- Patches 1-3 remain unchanged from v2 and constitute the following:
- Fix open parenthesis alignment.
- Fix multiple blank line check.
- Fix missing blank line after declaration.
- Patch 4 fixes the additional space after "/*" and before BoardType which was addressed by Greg KH.
- Patch 5 sanitizes the modified files of irregular white space alignment within a line comment.

Changes in v2:
- staging: rtl8723bs: fix open parenthesis alignment
- staging: rtl8723bs: fix multiple blank line check
- staging: rtl8723bs: fix missing blank line after declaration
- staging: rtl8723bs: fix line length check

Changes in v1:
v1 comprised of fixes for multiple checkpatch.pl warning/checks.

Mahad Ibrahim (5):
staging: rtl8723bs: fix open parenthesis alignment
staging: rtl8723bs: fix multiple blank line check
staging: rtl8723bs: fix missing blank line after declaration
staging: rtl8723bs: fix line length check
staging: rtl8723bs: standardize comment style in HAL

 .../staging/rtl8723bs/hal/HalHWImg8723B_BB.c  | 59 +++++++++----------
 .../staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 46 ++++++++-------
 2 files changed, 52 insertions(+), 53 deletions(-)
Signature · 1 line
2.47.3
author
#1 lore raw

PATCH v3 1/5 staging: rtl8723bs: fix open parenthesis alignment

Fix checkpatch.pl check regarding:
- Lines should not end with a '('

Collapse the multi-line function signature of CheckPositive() into a single line to adhere to kernel coding standards.

Signed-off-by Mahad Ibrahim <[email protected]>
---
 drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c  | 4 +---
 drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c +1 -3
index 5fcb9420fb3d..ab5af96c335f 100644
@@ -8,9 +8,7 @@
 #include <linux/kernel.h>
 #include "odm_precomp.h"
 
-static bool CheckPositive(
-	struct dm_odm_t *pDM_Odm, const u32 Condition1, const u32 Condition2
-)
+static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const u32 Condition2)
 {
 	u8 _BoardType =
 		((pDM_Odm->BoardType & BIT4) >> 4) << 0 | /*  _GLNA */
drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c +1 -3
index 9c07df254eaa..ac5e3d52b3bc 100644
@@ -8,9 +8,7 @@
 #include <linux/kernel.h>
 #include "odm_precomp.h"
 
-static bool CheckPositive(
-	struct dm_odm_t *pDM_Odm, const u32 Condition1, const u32 Condition2
-)
+static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const u32 Condition2)
 {
 	u8 _BoardType =
 		((pDM_Odm->BoardType & BIT4) >> 4) << 0 | /*  _GLNA */
Signature · 1 line
2.47.3
author
#2 lore raw

PATCH v3 2/5 staging: rtl8723bs: fix multiple blank line check

In reply to Mahad Ibrahim

Fix checkpatch.pl check regarding:
- Please don't use multiple blank lines

Remove multiple blank lines to adhere to kernel coding standards.

Signed-off-by Mahad Ibrahim <[email protected]>
---
 drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c  | 1 -
 drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 1 -
 2 files changed, 2 deletions(-)
drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c +0 -1
index ab5af96c335f..988636a16112 100644
@@ -31,7 +31,6 @@ static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const
 		pDM_Odm->TypeALNA << 16 |
 		pDM_Odm->TypeAPA << 24;
 
-
 	/*  Value Defined Check =============== */
 	/* QFN Type [15:12] and Cut Version [27:24] need to do value check */
drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c +0 -1
index ac5e3d52b3bc..1fbb71149cc7 100644
@@ -31,7 +31,6 @@ static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const
 		pDM_Odm->TypeALNA << 16 |
 		pDM_Odm->TypeAPA  << 24;
 
-
 	/*  Value Defined Check =============== */
 	/* QFN Type [15:12] and Cut Version [27:24] need to do value check */
Signature · 1 line
2.47.3
author
#3 lore raw

PATCH v3 3/5 staging: rtl8723bs: fix missing blank line after declaration

In reply to Mahad Ibrahim

Fix checkpatch.pl warning regarding:
- Missing a blank line after declarations

Adhere to kernel coding standards by adding a blank line after variable declaration.

Signed-off-by Mahad Ibrahim <[email protected]>
---
 drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 1 +
 1 file changed, 1 insertion(+)
drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c +1 -0
index 1fbb71149cc7..b7176a992518 100644
@@ -47,6 +47,7 @@ static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const
 
 	if ((cond1 & driver1) == cond1) {
 		u32 bitMask = 0;
+
 		if ((cond1 & 0x0F) == 0) /*  BoardType is DONTCARE */
 			return true;
Signature · 1 line
2.47.3
author
#4 lore raw

PATCH v3 4/5 staging: rtl8723bs: fix line length check

In reply to Mahad Ibrahim

Fix checkpatch.pl check regarding:
- Line length of X exceeds 100 columns

Redistribute comments to multiple lines to adhere to kernel coding standards.

Signed-off-by Mahad Ibrahim <[email protected]>
---
 drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c +6 -2
index b7176a992518..e428884335a8 100644
@@ -60,7 +60,8 @@ static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const
 		if ((cond1 & BIT3) != 0) /* APA */
 			bitMask |= 0xFF000000;
 
-		if ((cond2 & bitMask) == (driver2 & bitMask)) /*  BoardType of each RF path is matched */
+		/* BoardType of each RF path is matched */
+		if ((cond2 & bitMask) == (driver2 & bitMask))
 			return true;
 	}
 	return false;

@@ -210,7 +211,10 @@ void ODM_ReadAndConfig_MP_8723B_MAC_REG(struct dm_odm_t *pDM_Odm)
 			}
 
 			if (!bMatched) {
-				/*  Condition isn't matched. Discard the following (offset, data) pairs. */
+				/*
+				 * Condition isn't matched.
+				 * Discard the following (offset, data) pairs.
+				 */
 				while (v1 < 0x40000000 && i < ArrayLen - 2)
 					READ_NEXT_PAIR(v1, v2, i);
Signature · 1 line
2.47.3
author
#5 lore raw

PATCH v3 5/5 staging: rtl8723bs: standardize comment style in HAL

In reply to Mahad Ibrahim

The kernel coding style for comments requires a single space after the "/*". Currently, many files in HAL contain two spaces after the "/*", or use irregular indentation. The modified files also suffer from this.

Fix line comment style inconsistencies by removing additional space after "/*" to adhere to kernel coding standards.

Signed-off-by Mahad Ibrahim <[email protected]>
---
 .../staging/rtl8723bs/hal/HalHWImg8723B_BB.c  | 54 +++++++++----------
 .../staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 32 +++++------
 2 files changed, 43 insertions(+), 43 deletions(-)
drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c +27 -27
index 988636a16112..4666b2ff3157 100644
@@ -11,11 +11,11 @@
 static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const u32 Condition2)
 {
 	u8 _BoardType =
-		((pDM_Odm->BoardType & BIT4) >> 4) << 0 | /*  _GLNA */
-		((pDM_Odm->BoardType & BIT3) >> 3) << 1 | /*  _GPA */
-		((pDM_Odm->BoardType & BIT7) >> 7) << 2 | /*  _ALNA */
-		((pDM_Odm->BoardType & BIT6) >> 6) << 3 | /*  _APA */
-		((pDM_Odm->BoardType & BIT2) >> 2) << 4;  /*  _BT */
+		((pDM_Odm->BoardType & BIT4) >> 4) << 0 | /* _GLNA */
+		((pDM_Odm->BoardType & BIT3) >> 3) << 1 | /* _GPA */
+		((pDM_Odm->BoardType & BIT7) >> 7) << 2 | /* _ALNA */
+		((pDM_Odm->BoardType & BIT6) >> 6) << 3 | /* _APA */
+		((pDM_Odm->BoardType & BIT2) >> 2) << 4;  /* _BT */
 
 	u32 cond1 = Condition1, cond2 = Condition2;
 	u32 driver1 =

@@ -31,7 +31,7 @@ static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const
 		pDM_Odm->TypeALNA << 16 |
 		pDM_Odm->TypeAPA << 24;
 
-	/*  Value Defined Check =============== */
+	/* Value Defined Check =============== */
 	/* QFN Type [15:12] and Cut Version [27:24] need to do value check */
 
 	if (((cond1 & 0x0000F000) != 0) && ((cond1 & 0x0000F000) != (driver1 & 0x0000F000)))

@@ -39,16 +39,16 @@ static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const
 	if (((cond1 & 0x0F000000) != 0) && ((cond1 & 0x0F000000) != (driver1 & 0x0F000000)))
 		return false;
 
-	/*  Bit Defined Check ================ */
-	/*  We don't care [31:28] and [23:20] */
-	/*  */
+	/* Bit Defined Check ================ */
+	/* We don't care [31:28] and [23:20] */
+	/* */
 	cond1   &= 0x000F0FFF;
 	driver1 &= 0x000F0FFF;
 
 	if ((cond1 & driver1) == cond1) {
 		u32 bitMask = 0;
 
-		if ((cond1 & 0x0F) == 0) /*  BoardType is DONTCARE */
+		if ((cond1 & 0x0F) == 0) /* BoardType is DONTCARE */
 			return true;
 
 		if ((cond1 & BIT0) != 0) /* GLNA */

@@ -60,7 +60,7 @@ static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const
 		if ((cond1 & BIT3) != 0) /* APA */
 			bitMask |= 0xFF000000;
 
-		/*  BoardType of each RF path is matched */
+		/* BoardType of each RF path is matched */
 		if ((cond2 & bitMask) == (driver2 & bitMask))
 			return true;
 	}

@@ -216,16 +216,16 @@ void ODM_ReadAndConfig_MP_8723B_AGC_TAB(struct dm_odm_t *pDM_Odm)
 		u32 v1 = Array[i];
 		u32 v2 = Array[i + 1];
 
-		/*  This (offset, data) pair doesn't care the condition. */
+		/* This (offset, data) pair doesn't care the condition. */
 		if (v1 < 0x40000000) {
 			odm_ConfigBB_AGC_8723B(pDM_Odm, v1, bMaskDWord, v2);
 			continue;
 		} else {
-			/*  This line is the beginning of branch. */
+			/* This line is the beginning of branch. */
 			bool bMatched = true;
 			u8  cCond  = (u8)((v1 & (BIT29 | BIT28)) >> 28);
 
-			if (cCond == COND_ELSE) { /*  ELSE, ENDIF */
+			if (cCond == COND_ELSE) { /* ELSE, ENDIF */
 				bMatched = true;
 				READ_NEXT_PAIR(v1, v2, i);
 			} else if (!CheckPositive(pDM_Odm, v1, v2)) {

@@ -240,21 +240,21 @@ void ODM_ReadAndConfig_MP_8723B_AGC_TAB(struct dm_odm_t *pDM_Odm)
 
 			if (!bMatched) {
 				/*
-				 *   Condition isn't matched.
-				 *   Discard the following (offset, data) pairs.
+				 * Condition isn't matched.
+				 * Discard the following (offset, data) pairs.
 				 */
 				while (v1 < 0x40000000 && i < ArrayLen - 2)
 					READ_NEXT_PAIR(v1, v2, i);
 
-				i -= 2; /*  prevent from for-loop += 2 */
+				i -= 2; /* prevent from for-loop += 2 */
 			} else {
-				/*  Configure matched pairs and skip to end of if-else. */
+				/* Configure matched pairs and skip to end of if-else. */
 				while (v1 < 0x40000000 && i < ArrayLen - 2) {
 					odm_ConfigBB_AGC_8723B(pDM_Odm, v1, bMaskDWord, v2);
 					READ_NEXT_PAIR(v1, v2, i);
 				}
 
-				/*  Keeps reading until ENDIF. */
+				/* Keeps reading until ENDIF. */
 				cCond = (u8)((v1 & (BIT29 | BIT28)) >> 28);
 				while (cCond != COND_ENDIF && i < ArrayLen - 2) {
 					READ_NEXT_PAIR(v1, v2, i);

@@ -476,16 +476,16 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG(struct dm_odm_t *pDM_Odm)
 		u32 v1 = Array[i];
 		u32 v2 = Array[i + 1];
 
-		/*  This (offset, data) pair doesn't care the condition. */
+		/* This (offset, data) pair doesn't care the condition. */
 		if (v1 < 0x40000000) {
 			odm_ConfigBB_PHY_8723B(pDM_Odm, v1, bMaskDWord, v2);
 			continue;
 		} else {
-			/*  This line is the beginning of branch. */
+			/* This line is the beginning of branch. */
 			bool bMatched = true;
 			u8  cCond  = (u8)((v1 & (BIT29 | BIT28)) >> 28);
 
-			if (cCond == COND_ELSE) { /*  ELSE, ENDIF */
+			if (cCond == COND_ELSE) { /* ELSE, ENDIF */
 				bMatched = true;
 				READ_NEXT_PAIR(v1, v2, i);
 			} else if (!CheckPositive(pDM_Odm, v1, v2)) {

@@ -500,20 +500,20 @@ void ODM_ReadAndConfig_MP_8723B_PHY_REG(struct dm_odm_t *pDM_Odm)
 
 			if (!bMatched) {
 				/*
-				 *   Condition isn't matched.
-				 *   Discard the following (offset, data) pairs.
+				 * Condition isn't matched.
+				 * Discard the following (offset, data) pairs.
 				 */
 				while (v1 < 0x40000000 && i < ArrayLen - 2)
 					READ_NEXT_PAIR(v1, v2, i);
 
-				i -= 2; /*  prevent from for-loop += 2 */
-			} else { /*  Configure matched pairs and skip to end of if-else. */
+				i -= 2; /* prevent from for-loop += 2 */
+			} else { /* Configure matched pairs and skip to end of if-else. */
 				while (v1 < 0x40000000 && i < ArrayLen - 2) {
 					odm_ConfigBB_PHY_8723B(pDM_Odm, v1, bMaskDWord, v2);
 					READ_NEXT_PAIR(v1, v2, i);
 				}
 
-				/*  Keeps reading until ENDIF. */
+				/* Keeps reading until ENDIF. */
 				cCond = (u8)((v1 & (BIT29 | BIT28)) >> 28);
 				while (cCond != COND_ENDIF && i < ArrayLen - 2) {
 					READ_NEXT_PAIR(v1, v2, i);
drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c +16 -16
index e428884335a8..9a3393f5122b 100644
@@ -11,11 +11,11 @@
 static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const u32 Condition2)
 {
 	u8 _BoardType =
-		((pDM_Odm->BoardType & BIT4) >> 4) << 0 | /*  _GLNA */
-		((pDM_Odm->BoardType & BIT3) >> 3) << 1 | /*  _GPA */
-		((pDM_Odm->BoardType & BIT7) >> 7) << 2 | /*  _ALNA */
-		((pDM_Odm->BoardType & BIT6) >> 6) << 3 | /*  _APA */
-		((pDM_Odm->BoardType & BIT2) >> 2) << 4;  /*  _BT */
+		((pDM_Odm->BoardType & BIT4) >> 4) << 0 | /* _GLNA */
+		((pDM_Odm->BoardType & BIT3) >> 3) << 1 | /* _GPA */
+		((pDM_Odm->BoardType & BIT7) >> 7) << 2 | /* _ALNA */
+		((pDM_Odm->BoardType & BIT6) >> 6) << 3 | /* _APA */
+		((pDM_Odm->BoardType & BIT2) >> 2) << 4;  /* _BT */
 
 	u32   cond1   = Condition1, cond2 = Condition2;
 	u32    driver1 =

@@ -31,7 +31,7 @@ static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const
 		pDM_Odm->TypeALNA << 16 |
 		pDM_Odm->TypeAPA  << 24;
 
-	/*  Value Defined Check =============== */
+	/* Value Defined Check =============== */
 	/* QFN Type [15:12] and Cut Version [27:24] need to do value check */
 
 	if (((cond1 & 0x0000F000) != 0) && ((cond1 & 0x0000F000) != (driver1 & 0x0000F000)))

@@ -39,16 +39,16 @@ static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const
 	if (((cond1 & 0x0F000000) != 0) && ((cond1 & 0x0F000000) != (driver1 & 0x0F000000)))
 		return false;
 
-	/*  Bit Defined Check ================ */
-	/*  We don't care [31:28] and [23:20] */
-	/*  */
+	/* Bit Defined Check ================ */
+	/* We don't care [31:28] and [23:20] */
+	/* */
 	cond1   &= 0x000F0FFF;
 	driver1 &= 0x000F0FFF;
 
 	if ((cond1 & driver1) == cond1) {
 		u32 bitMask = 0;
 
-		if ((cond1 & 0x0F) == 0) /*  BoardType is DONTCARE */
+		if ((cond1 & 0x0F) == 0) /* BoardType is DONTCARE */
 			return true;
 
 		if ((cond1 & BIT0) != 0) /* GLNA */

@@ -188,16 +188,16 @@ void ODM_ReadAndConfig_MP_8723B_MAC_REG(struct dm_odm_t *pDM_Odm)
 		u32 v1 = Array[i];
 		u32 v2 = Array[i + 1];
 
-		/*  This (offset, data) pair doesn't care the condition. */
+		/* This (offset, data) pair doesn't care the condition. */
 		if (v1 < 0x40000000) {
 			odm_ConfigMAC_8723B(pDM_Odm, v1, (u8)v2);
 			continue;
 		} else {
-			/*  This line is the beginning of branch. */
+			/* This line is the beginning of branch. */
 			bool bMatched = true;
 			u8  cCond  = (u8)((v1 & (BIT29 | BIT28)) >> 28);
 
-			if (cCond == COND_ELSE) { /*  ELSE, ENDIF */
+			if (cCond == COND_ELSE) { /* ELSE, ENDIF */
 				bMatched = true;
 				READ_NEXT_PAIR(v1, v2, i);
 			} else if (!CheckPositive(pDM_Odm, v1, v2)) {

@@ -218,14 +218,14 @@ void ODM_ReadAndConfig_MP_8723B_MAC_REG(struct dm_odm_t *pDM_Odm)
 				while (v1 < 0x40000000 && i < ArrayLen - 2)
 					READ_NEXT_PAIR(v1, v2, i);
 
-				i -= 2; /*  prevent from for-loop += 2 */
-			} else { /*  Configure matched pairs and skip to end of if-else. */
+				i -= 2; /* prevent from for-loop += 2 */
+			} else { /* Configure matched pairs and skip to end of if-else. */
 				while (v1 < 0x40000000 && i < ArrayLen - 2) {
 					odm_ConfigMAC_8723B(pDM_Odm, v1, (u8)v2);
 					READ_NEXT_PAIR(v1, v2, i);
 				}
 
-				/*  Keeps reading until ENDIF. */
+				/* Keeps reading until ENDIF. */
 				cCond = (u8)((v1 & (BIT29 | BIT28)) >> 28);
 				while (cCond != COND_ENDIF && i < ArrayLen - 2) {
 					READ_NEXT_PAIR(v1, v2, i);
Signature · 1 line
2.47.3
maintainer
#6 lore raw

Re: [PATCH v3 5/5] staging: rtl8723bs: standardize comment style in HAL

drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const · line 44

Quoted 10 lines · Mahad Ibrahim
drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c +3 -3
@@ -39,16 +39,16 @@ static bool CheckPositive(struct dm_odm_t *pDM_Odm, const u32 Condition1, const
 	if (((cond1 & 0x0F000000) != 0) && ((cond1 & 0x0F000000) != (driver1 & 0x0F000000)))
 		return false;
 
-	/*  Bit Defined Check ================ */
-	/*  We don't care [31:28] and [23:20] */
-	/*  */
+	/* Bit Defined Check ================ */
+	/* We don't care [31:28] and [23:20] */
+	/* */

In the future, this "blank" comment line can also be removed.

thanks,

greg k-h