staging: rtl8723bs: fix yoda condition in rtl8723b_cmd

PATCH In review Ignacio Peña 3 participants 8 messages Jul 16, 2025 Staging

lore

Share & tools

lore

Ignacio Peña

author

2025-07-16 11:38 UTC #0 lore raw

PATCH 1/4 staging: rtl8723bs: fix yoda condition in rtl8723b_cmd

From: Ignacio Pena <[email protected]>

Fix checkpatch warning about comparisons that should place the constant on the right side of the test.

Signed-off-by Ignacio Pena <[email protected]>

---
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +1 -1

index 56526056d..abc123def 100644
@@ -24,7 +24,7 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num)
 
 	do {
 		valid = rtw_read8(padapter, REG_HMETFR) & BIT(msgbox_num);
-		if (0 == valid) {
+		if (valid == 0) {
 			read_down = true;
 		}
 	} while ((!read_down) && (retry_cnts--));

Signature · 1 line

2.39.5

Ignacio Peña

author

2025-07-16 11:38 UTC #1 lore raw

PATCH 2/4 staging: rtl8723bs: remove unnecessary braces in rtl8723b_cmd

From: Ignacio Pena <[email protected]>

Remove braces that are not necessary for single statement blocks to fix checkpatch warnings.

Signed-off-by Ignacio Pena <[email protected]>

---
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +3 -6

index abc123def..def456abc 100644
@@ -24,9 +24,8 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num)
 
 	do {
 		valid = rtw_read8(padapter, REG_HMETFR) & BIT(msgbox_num);
-		if (valid == 0) {
+		if (valid == 0)
 			read_down = true;
-		}
 	} while ((!read_down) && (retry_cnts--));
 
 	return read_down;

@@ -57,13 +56,11 @@ s32 FillH2CCmd8723B(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmd
 	if (mutex_lock_interruptible(&(adapter_to_dvobj(padapter)->h2c_fwcmd_mutex)))
 		return ret;
 
-	if (!pCmdBuffer) {
+	if (!pCmdBuffer)
 		goto exit;
-	}
 
-	if (CmdLen > RTL8723B_MAX_CMD_LEN) {
+	if (CmdLen > RTL8723B_MAX_CMD_LEN)
 		goto exit;
-	}
 
 	if (padapter->bSurpriseRemoved)
 		goto exit;

Signature · 1 line

2.39.5

Ignacio Peña

author

2025-07-16 11:38 UTC #2 lore raw

PATCH 3/4 staging: rtl8723bs: fix block comment alignment in rtl8723b_cmd

In reply to Ignacio Peña

From: Ignacio Pena <[email protected]>

Fix block comment formatting to align the * on each line properly according to kernel coding style.

Signed-off-by Ignacio Pena <[email protected]>

---
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +15 ~~-14~~

index def456abc..789abc123 100644
@@ -34,13 +34,13 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num)
 
 
 /*****************************************
-* H2C Msg format :
-*| 31 - 8		|7-5	| 4 - 0	|
-*| h2c_msg	|Class	|CMD_ID |
-*| 31-0						|
-*| Ext msg					|
-*
-******************************************/
+ * H2C Msg format :
+ * | 31 - 8		|7-5	| 4 - 0	|
+ * | h2c_msg	|Class	|CMD_ID |
+ * | 31-0						|
+ * | Ext msg					|
+ *
+ ******************************************/
 s32 FillH2CCmd8723B(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer)
 {
 	u8 h2c_box_num;

@@ -435,13 +435,13 @@ void rtl8723b_set_FwPwrMode_cmd(struct adapter *padapter, u8 psmode)
 
 		}
 
-/* offload to FW if fw version > v15.10
-		pmlmeext->DrvBcnEarly = 0;
-		pmlmeext->DrvBcnTimeOut =7;
-
-		if ((pmlmeext->DrvBcnEarly!= 0Xff) && (pmlmeext->DrvBcnTimeOut!= 0xff))
-			u1H2CPwrModeParm[H2C_PWRMODE_LEN-1] = BIT(0) | ((pmlmeext->DrvBcnEarly<<1)&0x0E) |((pmlmeext->DrvBcnTimeOut<<4)&0xf0) ;
-*/
+/*
+ * offload to FW if fw version > v15.10
+ *		pmlmeext->DrvBcnEarly = 0;
+ *		pmlmeext->DrvBcnTimeOut =7;
+ *
+ *		if ((pmlmeext->DrvBcnEarly!= 0Xff) && (pmlmeext->DrvBcnTimeOut!= 0xff))
+ *			u1H2CPwrModeParm[H2C_PWRMODE_LEN-1] = BIT(0) | ((pmlmeext->DrvBcnEarly<<1)&0x0E) |((pmlmeext->DrvBcnTimeOut<<4)&0xf0) ;
+ */
 
 	}

Signature · 1 line

2.39.5

Greg KH

maintainer

2025-07-16 12:01 UTC #3 lore raw

Re: [PATCH 3/4] staging: rtl8723bs: fix block comment alignment in rtl8723b_cmd

Quoted 8 lines · Ignacio Peña

+/*
+ * offload to FW if fw version > v15.10
+ * pmlmeext->DrvBcnEarly = 0;
+ * pmlmeext->DrvBcnTimeOut =7;
+ *
+ * if ((pmlmeext->DrvBcnEarly!= 0Xff) && (pmlmeext->DrvBcnTimeOut!= 0xff))
+ * u1H2CPwrModeParm[H2C_PWRMODE_LEN-1] = BIT(0) | ((pmlmeext->DrvBcnEarly<<1)&0x0E) |((pmlmeext->DrvBcnTimeOut<<4)&0xf0) ;
+ */

Why is this even still needed? Shouldn't it just be deleted instead?

thanks,

greg k-h

Dan Carpenter

2025-07-16 14:58 UTC #4 lore raw

Re: [PATCH 3/4] staging: rtl8723bs: fix block comment alignment in rtl8723b_cmd

In reply to Ignacio Peña

Quoted 22 lines · Ignacio Peña

From: Ignacio Pena <[email protected]>
Fix block comment formatting to align the * on each line properly according to kernel coding style.
Signed-off-by Ignacio Pena <[email protected]>
---
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +0 -4
index def456abc..789abc123 100644
@@ -34,13 +34,13 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num)
 
 
 /*****************************************
-* H2C Msg format :
-*| 31 - 8		|7-5	| 4 - 0	|
-*| h2c_msg	|Class	|CMD_ID |
-*| 31-0						|

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num) · line 43

Quoted 10 lines

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +7 -3

-*| Ext msg					|
-*
-******************************************/
+ * H2C Msg format :
+ * | 31 - 8		|7-5	| 4 - 0	|
+ * | h2c_msg	|Class	|CMD_ID |
+ * | 31-0						|
+ * | Ext msg					|
+ *
+ ******************************************/

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This is not the correct comment format.

regards,
dan carpenter

Ignacio Peña

author

2025-07-16 11:38 UTC #5 lore raw

PATCH 4/4 staging: rtl8723bs: fix tab spacing in rtl8723b_cmd

In reply to Ignacio Peña

From: Ignacio Pena <[email protected]>

Fix checkpatch warning about space before tab in commented code.

Signed-off-by Ignacio Pena <[email protected]>

---
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +1 -1

index 789abc123..012def345 100644
@@ -77,7 +77,7 @@ s32 FillH2CCmd8723B(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmd
 		else {
 			memcpy((u8 *)(&h2c_cmd)+1, pCmdBuffer, 3);
 			memcpy((u8 *)(&h2c_cmd_ex), pCmdBuffer+3, CmdLen-3);
-/* 			*(u8 *)(&h2c_cmd) |= BIT(7); */
+/*			*(u8 *)(&h2c_cmd) |= BIT(7); */
 		}
 
 		*(u8 *)(&h2c_cmd) |= ElementID;

Signature · 1 line

2.39.5

Dan Carpenter

2025-07-16 14:57 UTC #7 lore raw

In reply to Ignacio Peña

Quoted 15 lines · Ignacio Peña

From: Ignacio Pena <[email protected]>
Fix checkpatch warning about comparisons that should place the constant on the right side of the test.
Signed-off-by Ignacio Pena <[email protected]>
---
 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +0 -0
index 56526056d..abc123def 100644

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num) · line 27

Quoted 5 lines

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +1 -1

@@ -24,7 +24,7 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num)
 
 	do {
 		valid = rtw_read8(padapter, REG_HMETFR) & BIT(msgbox_num);
-		if (0 == valid) {
+		if (valid == 0) {

Is "valid" a number? Like, are counting the number of valid things? "== 0," means it's a number or an ammount. Also it's idiomatic for strcmp() so we would say "if (strcmp(str, "foo") == 0)" to mean the strings are equal. For boolean, we would say "if (!valid)" except valid really means invalid in this context...

This whole function is garbage. Re-write it.

regards,
dan carpenter