lkml.org 
[lkml]   [2020]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3] staging: vt6656: add error code handling to unused variable
    Date
    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 <quentin.deslandes@itdev.co.uk>
    Suggested-by: Stefano Brivio <sbrivio@redhat.com>
    Signed-off-by: John B. Wyatt IV <jbwyatt4@gmail.com>
    ---
    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 <julia.lawall@inria.fr>

    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
    \
     
     \ /
      Last update: 2020-03-29 10:44    [W:3.769 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site