scsi: qla2xxx: Fix set-but-not-used variable warnings

[ Upstream commit 4fb2169d66b837a2986f569f5d5b81f79e6e4a4c ]

Fix the following two compiler warnings:

drivers/scsi/qla2xxx/qla_init.c: In function ‘qla24xx_async_abort_cmd’:
drivers/scsi/qla2xxx/qla_init.c:171:17: warning: variable ‘bail’ set but not used [-Wunused-but-set-variable]
  171 |         uint8_t bail;
      |                 ^~~~
drivers/scsi/qla2xxx/qla_init.c: In function ‘qla2x00_async_tm_cmd’:
drivers/scsi/qla2xxx/qla_init.c:2023:17: warning: variable ‘bail’ set but not used [-Wunused-but-set-variable]
 2023 |         uint8_t bail;
      |                 ^~~~

Cc: Arun Easi <arun.easi@qlogic.com>
Cc: Giridhar Malavali <giridhar.malavali@qlogic.com>
Fixes: feafb7b1714c ("[SCSI] qla2xxx: Fix vport delete issues")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20221031224818.2607882-1-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 51c7ce5f9792313153e7d269909b6805776596fd..307ffdfe048beb0566daa6b0e1a5f391f7825ec2 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -5117,17 +5117,17 @@ struct secure_flash_update_block_pk {
                (test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \
                         test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))
 
-#define QLA_VHA_MARK_BUSY(__vha, __bail) do {          \
-       atomic_inc(&__vha->vref_count);                 \
-       mb();                                           \
-       if (__vha->flags.delete_progress) {             \
-               atomic_dec(&__vha->vref_count);         \
-               wake_up(&__vha->vref_waitq);            \
-               __bail = 1;                             \
-       } else {                                        \
-               __bail = 0;                             \
-       }                                               \
-} while (0)
+static inline bool qla_vha_mark_busy(scsi_qla_host_t *vha)
+{
+       atomic_inc(&vha->vref_count);
+       mb();
+       if (vha->flags.delete_progress) {
+               atomic_dec(&vha->vref_count);
+               wake_up(&vha->vref_waitq);
+               return true;
+       }
+       return false;
+}
 
 #define QLA_VHA_MARK_NOT_BUSY(__vha) do {              \
        atomic_dec(&__vha->vref_count);                 \

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index b81797a3ab617e9e29bdf79c695b989919714a00..46b3b31a41bd160f75a986a9b5128381f867a627 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -168,7 +168,6 @@ int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)
        struct srb_iocb *abt_iocb;
        srb_t *sp;
        int rval = QLA_FUNCTION_FAILED;
-       uint8_t bail;
 
        /* ref: INIT for ABTS command */
        sp = qla2xxx_get_qpair_sp(cmd_sp->vha, cmd_sp->qpair, cmd_sp->fcport,
@@ -176,7 +175,7 @@ int qla24xx_async_abort_cmd(srb_t *cmd_sp, bool wait)
        if (!sp)
                return QLA_MEMORY_ALLOC_FAILED;
 
-       QLA_VHA_MARK_BUSY(vha, bail);
+       qla_vha_mark_busy(vha);
        abt_iocb = &sp->u.iocb_cmd;
        sp->type = SRB_ABT_CMD;
        sp->name = "abort";
@@ -2022,14 +2021,13 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun,
        struct srb_iocb *tm_iocb;
        srb_t *sp;
        int rval = QLA_FUNCTION_FAILED;
-       uint8_t bail;
 
        /* ref: INIT */
        sp = qla2x00_get_sp(vha, fcport, GFP_KERNEL);
        if (!sp)
                goto done;
 
-       QLA_VHA_MARK_BUSY(vha, bail);
+       qla_vha_mark_busy(vha);
        sp->type = SRB_TM_CMD;
        sp->name = "tmf";
        qla2x00_init_async_sp(sp, qla2x00_get_async_timeout(vha),

diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
index db17f7f410cddeaf23d899ecea93047f8743d053..5185dc5daf80d47cbf279faf95ce0e0a777603f8 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_inline.h
+++ b/drivers/scsi/qla2xxx/qla_inline.h
@@ -225,11 +225,9 @@ static inline srb_t *
 qla2x00_get_sp(scsi_qla_host_t *vha, fc_port_t *fcport, gfp_t flag)
 {
        srb_t *sp = NULL;
-       uint8_t bail;
        struct qla_qpair *qpair;
 
-       QLA_VHA_MARK_BUSY(vha, bail);
-       if (unlikely(bail))
+       if (unlikely(qla_vha_mark_busy(vha)))
                return NULL;
 
        qpair = vha->hw->base_qpair;

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 00e97f0a07ebe8e401ab4ba858fd8d36f93f9441..05d827227d0b3aa4bb2a41e0a7a0b67cb5617db3 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -5043,13 +5043,11 @@ struct qla_work_evt *
 qla2x00_alloc_work(struct scsi_qla_host *vha, enum qla_work_type type)
 {
        struct qla_work_evt *e;
-       uint8_t bail;
 
        if (test_bit(UNLOADING, &vha->dpc_flags))
                return NULL;
 
-       QLA_VHA_MARK_BUSY(vha, bail);
-       if (bail)
+       if (qla_vha_mark_busy(vha))
                return NULL;
 
        e = kzalloc(sizeof(struct qla_work_evt), GFP_ATOMIC);