lkml.org 
[lkml]   [2020]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 39/40] scsi: mvsas: mv_init: Move 'core_nr' inside #ifdef and remove unused variable 'res_flag'
    Date
    Only declare 'core_nr' if its conditions for use are met.

    Fixes the following W=1 kernel build warning(s):

    drivers/scsi/mvsas/mv_init.c: In function ‘mvs_interrupt’:
    drivers/scsi/mvsas/mv_init.c:180:6: warning: variable ‘core_nr’ set but not used [-Wunused-but-set-variable]
    drivers/scsi/mvsas/mv_init.c: In function ‘mvs_ioremap’:
    drivers/scsi/mvsas/mv_init.c:302:36: warning: variable ‘res_flag’ set but not used [-Wunused-but-set-variable]

    Cc: Jason Yan <yanaijie@huawei.com>
    Cc: Marvell <kewei@marvell.com>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    ---
    drivers/scsi/mvsas/mv_init.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
    index b0de3bdb01db0..3b450319cc11e 100644
    --- a/drivers/scsi/mvsas/mv_init.c
    +++ b/drivers/scsi/mvsas/mv_init.c
    @@ -177,15 +177,17 @@ static void mvs_tasklet(unsigned long opaque)

    static irqreturn_t mvs_interrupt(int irq, void *opaque)
    {
    - u32 core_nr;
    u32 stat;
    struct mvs_info *mvi;
    struct sas_ha_struct *sha = opaque;
    #ifndef CONFIG_SCSI_MVSAS_TASKLET
    u32 i;
    -#endif
    +#else
    + u32 core_nr;

    core_nr = ((struct mvs_prv_info *)sha->lldd_ha)->n_host;
    +#endif
    +
    mvi = ((struct mvs_prv_info *)sha->lldd_ha)->mvi[0];

    if (unlikely(!mvi))
    @@ -299,7 +301,7 @@ static int mvs_alloc(struct mvs_info *mvi, struct Scsi_Host *shost)

    int mvs_ioremap(struct mvs_info *mvi, int bar, int bar_ex)
    {
    - unsigned long res_start, res_len, res_flag, res_flag_ex = 0;
    + unsigned long res_start, res_len, res_flag_ex = 0;
    struct pci_dev *pdev = mvi->pdev;
    if (bar_ex != -1) {
    /*
    @@ -327,7 +329,6 @@ int mvs_ioremap(struct mvs_info *mvi, int bar, int bar_ex)
    goto err_out;
    }

    - res_flag = pci_resource_flags(pdev, bar);
    mvi->regs = ioremap(res_start, res_len);

    if (!mvi->regs) {
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-07-21 19:10    [W:2.883 / U:1.328 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site