staging: vt6656: add error code handling to unused variable
PATCH v3 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).
---
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
@@ -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
Quoted 8 lines · John B. Wyatt IV
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]>Signed-off-by John B. Wyatt IV <[email protected]>
Quoted 6 lines
---
v3: Forgot to add v2 code changes to commit.v2: Replace goto statements with return.
Remove last if check because it was unneeded.Suggested-by Julia Lawall <[email protected]>
Because it's after the comment line (---), this Suggested-by tag will be stripped-off when applying the patch.
Quoted 47 lines
drivers/staging/vt6656/card.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)drivers/staging/vt6656/card.c +11
-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,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
If you could fix it, then add my review tag.
Thanks,
Quentin
Quoted 14 lines · Quentin Deslandes
Quoted 13 lines · John B. Wyatt IV
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]>Signed-off-by John B. Wyatt IV <[email protected]>---
v3: Forgot to add v2 code changes to commit.
Quoted 7 lines
Quoted 3 lines
v2: Replace goto statements with return.
Remove last if check because it was unneeded.Suggested-by Julia Lawall <[email protected]>Because it's after the comment line (---), this Suggested-by tag will be
stripped-off when applying the patch.
Understood.
Quoted 6 lines
If you could fix it, then add my review tag.
Reviewed-by Quentin Deslandes <[email protected]>Thanks,
Quentin
Done. Please see v4.