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]>
---
v7: Move an if check.
Suggested by Stefano Brivio <[email protected]>
v6: Forgot to add all the v5 code to commit.
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 | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index dc3ab10eb630..df12c73097e0 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));
- break;
+ ret = vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL,
+ (SOFTPWRCTL_SWPE2 |
+ SOFTPWRCTL_SWPE3));
+ 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 15:37:18 -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]>
> ---
> v7: Move an if check.
> Suggested by Stefano Brivio <[email protected]>
>
> v6: Forgot to add all the v5 code to commit.
>
> 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 | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
> index dc3ab10eb630..df12c73097e0 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));
> - break;
> + ret = vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL,
> + (SOFTPWRCTL_SWPE2 |
> + SOFTPWRCTL_SWPE3));
Grrr, sorry, almost there, I didn't notice this: SOFTPWRCTL_SWPE3 needs
to be aligned *after* the open (useless) parenthesis:
(SOFTPWRCTL_SWPE2 |
SOFTPWRCTL_SWPE3));
because it's another operand of the | operation surrounded by ().
Doesn't checkpatch warn?
The rest looks good to me.
--
Stefano
On Tue, 2020-03-31 at 00:42 +0200, Stefano Brivio wrote:
> On Mon, 30 Mar 2020 15:37:18 -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]>
> > ---
> > v7: Move an if check.
> > Suggested by Stefano Brivio <[email protected]>
> >
> > v6: Forgot to add all the v5 code to commit.
> >
> > 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 | 20 ++++++++++++--------
> > 1 file changed, 12 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/staging/vt6656/card.c
> > b/drivers/staging/vt6656/card.c
> > index dc3ab10eb630..df12c73097e0 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));
> > - break;
> > + ret = vnt_mac_reg_bits_on(priv, MAC_REG_SOFTPWRCTL,
> > + (SOFTPWRCTL_SWPE2 |
> > + SOFTPWRCTL_SWPE3));
>
> Grrr, sorry, almost there, I didn't notice this: SOFTPWRCTL_SWPE3
> needs
> to be aligned *after* the open (useless) parenthesis:
>
> (SOFTPWRCTL_SWPE2 |
> SOFTPWRCTL_SWPE3));
>
> because it's another operand of the | operation surrounded by ().
> Doesn't checkpatch warn?
>
> The rest looks good to me.
>
I had to switch from a VM to native and forget to put the git hook in
this repo clone.
Still, after I did, checkpatch complained about trailing white space
after SOFTPWRCTL_SWPE2 |, but not the alignment issue. Fixing the
alignment issue produced no warnings either. :(