2020-03-29 08:45:15

by John B. Wyatt IV

Subject: [PATCH v3] 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).

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.

v2: Replace goto statements with return.
Remove last if check because it was unneeded.
Suggested-by: Julia Lawall <[email protected]>

drivers/staging/vt6656/card.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index dc3ab10eb630..239012539e73 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -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)
--
2.25.1

2020-03-30 15:48:59

by Quentin Deslandes

Subject: Re: [PATCH v3] staging: vt6656: add error code handling to unused variable

On 03/29/20 01:43:20, John B. Wyatt IV wrote:
> 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]>
> ---
> 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.

>
> drivers/staging/vt6656/card.c | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
> index dc3ab10eb630..239012539e73 100644
> --- a/drivers/staging/vt6656/card.c
> +++ b/drivers/staging/vt6656/card.c
> @@ -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)
> --
> 2.25.1
>

If you could fix it, then add my review tag.

Reviewed-by: Quentin Deslandes <[email protected]>

Thanks,
Quentin

2020-03-30 16:50:57

by John B. Wyatt IV

Subject: Re: [PATCH v3] staging: vt6656: add error code handling to unused variable

On Mon, 2020-03-30 at 16:46 +0100, Quentin Deslandes wrote:
> On 03/29/20 01:43:20, John B. Wyatt IV wrote:
> > 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]>
> > ---
> > 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.

Understood.

> If you could fix it, then add my review tag.
>
> Reviewed-by: Quentin Deslandes <[email protected]>
>
> Thanks,
> Quentin

Done. Please see v4.