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.
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.
Suggested-by: Julia Lawall <[email protected]>
drivers/staging/vt6656/card.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index dc3ab10eb630..27fc53accdfd 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,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)
--
2.25.1
On Mon, 30 Mar 2020 11:45:17 -0700
"John B. Wyatt IV" <[email protected]> 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]>
> 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.
>
> [...]
>
> @@ -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;
Did you send the wrong version perhaps?
--
Stefano
On Mon, 2020-03-30 at 23:06 +0200, Stefano Brivio wrote:
> On Mon, 30 Mar 2020 11:45:17 -0700
> "John B. Wyatt IV" <[email protected]> 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]>
> > 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.
> >
> > [...]
> >
> > @@ -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;
>
> Did you send the wrong version perhaps?
>
Yes. My apologies. Please see v6.