staging: vt6656: add error code handling to unused variable
PATCH v5 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).
---
v5: Remove Suggested-by: Julia Lawall above seperator line.
Remove break; statement in switch block.
break; removal checked by both gcc compile and checkpatch. Suggested by Stefano Brivio <[email protected]>
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 | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/staging/vt6656/card.c +12 -7
@@ -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,15 @@ 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
Quoted 19 lines · On Mon, 30 Mar 2020 11:45:17 -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).
Suggested-by Quentin Deslandes <[email protected]>Suggested-by Stefano Brivio <[email protected]>Reviewed-by Quentin Deslandes <[email protected]>Signed-off-by John B. Wyatt IV <[email protected]>---
v5: Remove Suggested-by: Julia Lawall above seperator line.
Remove break; statement in switch block.
break; removal checked by both gcc compile and checkpatch.[...]
drivers/staging/vt6656/card.c +0
-0@@ -734,14 +738,15 @@ int vnt_radio_power_on(struct vnt_private *priv)case RF_VT3226 :case RF_VT3226D0 :
drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private *priv) · line 747
Quoted 10 lines
drivers/staging/vt6656/card.c +5
-2case 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;
Did you send the wrong version perhaps?
Signature · 1 line
Stefano
Quoted 30 lines · Stefano Brivio
Quoted 27 lines · On Mon, 30 Mar 2020 11:45:17 -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 withinvnt_radio_power_on.Issue reported by coccinelle (coccicheck).
Suggested-by Quentin Deslandes <[email protected]>Suggested-by Stefano Brivio <[email protected]>Reviewed-by Quentin Deslandes <[email protected]>Signed-off-by John B. Wyatt IV <[email protected]>---
v5: Remove Suggested-by: Julia Lawall above seperator line.
Remove break; statement in switch block.
break; removal checked by both gcc compile and checkpatch.[...]
drivers/staging/vt6656/card.c +1
-2@@ -734,14 +738,15 @@ 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,
Quoted 9 lines
drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private *priv) · line 747
Quoted 6 lines
drivers/staging/vt6656/card.c +4
-0+ (SOFTPWRCTL_SWPE2 | + SOFTPWRCTL_SWPE3));break ; } +if (ret) +return ret;Did you send the wrong version perhaps?
Yes. My apologies. Please see v6.