staging: vt6656: add error code handling to unused variable
PATCH 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).
--- drivers/staging/vt6656/card.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/staging/vt6656/card.c +14 -5
@@ -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) + goto end; -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) + goto end;switch (priv->rf_type) {case RF_AL2230 :
@@ -734,13 +738,18 @@ 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) + goto end; -vnt_mac_reg_bits_off (priv,MAC_REG_GPIOCTL1 ,GPIO3_INTMD ); + ret =vnt_mac_reg_bits_off (priv,MAC_REG_GPIOCTL1 ,GPIO3_INTMD ); +if (ret) + goto end; +end:return ret; }
Signature · 1 line
2.25.1
Quoted 17 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]>--- drivers/staging/vt6656/card.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)drivers/staging/vt6656/card.c +0
-0
drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private *priv) · line 728
Quoted 7 lines
drivers/staging/vt6656/card.c +3
-1@@ -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) + goto end;
Normally, if there is nothing to clean up, one can just say return ret.
Quoted 15 lines
drivers/staging/vt6656/card.c +4
-3-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) + goto end;switch (priv->rf_type) {case RF_AL2230 :@@ -734,13 +738,18 @@ 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,
drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private *priv) · line 750
Quoted 10 lines
drivers/staging/vt6656/card.c +6
-1+ (SOFTPWRCTL_SWPE2 | SOFTPWRCTL_SWPE3));break ; } +if (ret) + goto end; -vnt_mac_reg_bits_off (priv,MAC_REG_GPIOCTL1 ,GPIO3_INTMD ); + ret =vnt_mac_reg_bits_off (priv,MAC_REG_GPIOCTL1 ,GPIO3_INTMD ); +if (ret) + goto end;
There is no need for the above if, because whether ret is nonzero or not, you will just end up at the next line.
julia
Quoted 9 lines
drivers/staging/vt6656/card.c +1
-1+end:return ret; } --2.25.1
Quoted 27 lines · Julia Lawall
Quoted 24 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]>--- drivers/staging/vt6656/card.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)drivers/staging/vt6656/card.c +0
-0@@ -723,9 +723,13 @@ int vnt_radio_power_on(struct vnt_private *priv) {int ret =0 ;
Quoted 7 lines
drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private *priv) · line 728
Quoted 4 lines
drivers/staging/vt6656/card.c +3
-1-vnt_exit_deep_sleep (priv); + ret =vnt_exit_deep_sleep (priv); +if (ret) + goto end;Normally, if there is nothing to clean up, one can just say return ret.
Understood.
Quoted 24 lines
Quoted 24 lines
drivers/staging/vt6656/card.c +7
-3-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) + goto end;switch (priv->rf_type) {case RF_AL2230 :@@ -734,13 +738,18 @@ 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) + goto end;
Quoted 9 lines
drivers/staging/vt6656/card.c int vnt_radio_power_on(struct vnt_private *priv) · line 750
Quoted 5 lines
drivers/staging/vt6656/card.c +3
-1-vnt_mac_reg_bits_off (priv,MAC_REG_GPIOCTL1 ,GPIO3_INTMD ); + ret =vnt_mac_reg_bits_off (priv,MAC_REG_GPIOCTL1 ,GPIO3_INTMD ); +if (ret) + goto end;There is no need for the above if, because whether ret is nonzero or not,
you will just end up at the next line.
Understood. Sending new patch.
edit: resending this email because I forgot to cc outreachy mailing list.
Quoted 11 lines
julia
Quoted 8 lines
drivers/staging/vt6656/card.c +1
-0+end:return ret;
}--
2.25.1