Skip to contentSkip to conversation

staging: vt6656: add error code handling to unused variable

PATCH Superseded John B. Wyatt IV 3 participants 3 messages Mar 30, 2020 Staging

v4 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 staging: vt6656: add error code handling to unused variable

Add error code handling to unused 'ret' variable that was never used. Return an error code from functions called within vnt_radio_power_on.

Issue reported by coccinelle (coccicheck).

---
v4: Move Suggested-by: Julia Lawall above seperator line.
Add Reviewed-by tag as requested by Quentin Deslandes.

v3: Forgot to add v2 code changes to commit.

v2: Replace goto statements with return.
Remove last if check because it was unneeded.

 drivers/staging/vt6656/card.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/staging/vt6656/card.c +11 -7
index dc3ab10eb630..239012539e73 100644
@@ -723,9 +723,13 @@ int vnt_radio_power_on(struct vnt_private *priv)
 {
 	int ret = 0;
 
-	vnt_exit_deep_sleep(priv);
+	ret = vnt_exit_deep_sleep(priv);
+	if (ret)
+		return ret;
 
-	vnt_mac_reg_bits_on(priv, MAC_REG_HOSTCR, HOSTCR_RXON);
+	ret = vnt_mac_reg_bits_on(priv, MAC_REG_HOSTCR, HOSTCR_RXON);
+	if (ret)
+		return ret;
 
 	switch (priv->rf_type) {
 	case RF_AL2230:
@@ -734,14 +738,14 @@ int vnt_radio_power_on(struct vnt_private *priv)
 	case RF_VT3226:
 	case RF_VT3226D0:
 	case RF_VT3342A0:
-		vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL,
-				    (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));
+		ret = vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL,
+					 (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));
 		break;
 	}
+	if (ret)
+		return ret;
 
-	vnt_mac_reg_bits_off(priv, MAC_REG_GPIOCTL1, GPIO3_INTMD);
-
-	return ret;
+	return vnt_mac_reg_bits_off(priv, MAC_REG_GPIOCTL1, GPIO3_INTMD);
 }
 
 void vnt_set_bss_mode(struct vnt_private *priv)
Signature · 1 line
2.25.1
#1 lore raw
Quoted 5 lines · On Mon, 30 Mar 2020 09:45:30 -0700 "John B. Wyatt IV" <[email protected]>…

Add error code handling to unused 'ret' variable that was never used. Return an error code from functions called within vnt_radio_power_on.

Issue reported by coccinelle (coccicheck).

Quoted 7 lines

---
v4: Move Suggested-by: Julia Lawall above seperator line.

Actually, as Julia didn't suggest this patch, the place where you had this in v3 was the right one.

Quoted 33 lines

Add Reviewed-by tag as requested by Quentin Deslandes.

v3: Forgot to add v2 code changes to commit.

v2: Replace goto statements with return.
Remove last if check because it was unneeded.

 drivers/staging/vt6656/card.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/staging/vt6656/card.c +6 -2
index dc3ab10eb630..239012539e73 100644
@@ -723,9 +723,13 @@ int vnt_radio_power_on(struct vnt_private *priv)
 {
 	int ret = 0;
 
-	vnt_exit_deep_sleep(priv);
+	ret = vnt_exit_deep_sleep(priv);
+	if (ret)
+		return ret;
 
-	vnt_mac_reg_bits_on(priv, MAC_REG_HOSTCR, HOSTCR_RXON);
+	ret = vnt_mac_reg_bits_on(priv, MAC_REG_HOSTCR, HOSTCR_RXON);
+	if (ret)
+		return ret;
 
 	switch (priv->rf_type) {
 	case RF_AL2230:

drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private *priv) · line 742

Quoted 7 lines
drivers/staging/vt6656/card.c +2 -2
@@ -734,14 +738,14 @@ int vnt_radio_power_on(struct vnt_private *priv)
 	case RF_VT3226:
 	case RF_VT3226D0:
 	case RF_VT3342A0:
-		vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL,
-				    (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));
+		ret = vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL,
+					 (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));

Note that you broke the alignment here: the ( should be aligned with 'priv'. By the way, those parentheses are useless, but it's not something you should fix in this patch.

drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private *priv) · line 743

Quoted 1 line
drivers/staging/vt6656/card.c +0 -0
 		break;

Unless gcc whines (or checkpatch, even), you could replace this break by the if (ret) return ret; below. If some tool is not happy with this, though, you should still move that here: ret will be checked only for those values of 'rf_type'.

drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private *priv) · line 746

Quoted 3 lines
drivers/staging/vt6656/card.c +2 -0
 	}
+	if (ret)
+		return ret;

Another thing that should be considered in this function is to restore the previous hardware state on failures, but I think the way you're handling this is possibly the safest, without hardware to test on.

Signature · 1 line
Stefano
#2 lore raw
Quoted 16 lines · Stefano Brivio
Quoted 5 lines · On Mon, 30 Mar 2020 09:45:30 -0700 "John B. Wyatt IV" <[email protected]>…

Add error code handling to unused 'ret' variable that was never used. Return an error code from functions called within vnt_radio_power_on.

Issue reported by coccinelle (coccicheck).

Quoted 7 lines

---
v4: Move Suggested-by: Julia Lawall above seperator line.

Quoted 2 lines

Actually, as Julia didn't suggest this patch, the place where you had this in v3 was the right one.

---snip

Quoted 17 lines

drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private *priv) · line 742

Quoted 11 lines
  
  	switch (priv->rf_type) {
  	case RF_AL2230:
drivers/staging/vt6656/card.c +2 -2
@@ -734,14 +738,14 @@ int vnt_radio_power_on(struct vnt_private *priv)
  	case RF_VT3226:
  	case RF_VT3226D0:
  	case RF_VT3342A0:
-		vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL,
-				    (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));
+		ret = vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL,
+					 (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));

Another thing that should be considered in this function is to restore the previous hardware state on failures, but I think the way you're handling this is possibly the safest, without hardware to test on.

This section of hardware is controlled by mac80211 as is most of the driver.

Users can turn the wireless off then on again to try again but to date this is not known to fail with the hardware I have used.

No problems with hardware with this patch.