scsi: qla2xxx: Fix set-but-not-used variable warnings
Subsystems (2)
PATCH 1/1 scsi: qla2xxx: Fix set-but-not-used variable warnings
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;
| ^~~~
--- drivers/scsi/qla2xxx/qla_def.h | 22 +++++++++++----------- drivers/scsi/qla2xxx/qla_init.c | 6 ++---- drivers/scsi/qla2xxx/qla_inline.h | 4 +--- drivers/scsi/qla2xxx/qla_os.c | 4 +--- 4 files changed, 15 insertions(+), 21 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +11 -11
@@ -5136,17 +5136,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); \
drivers/scsi/qla2xxx/qla_init.c +2 -4
@@ -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" ;
@@ -2020,14 +2019,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),
drivers/scsi/qla2xxx/qla_inline.h +1 -3
@@ -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;
drivers/scsi/qla2xxx/qla_os.c +1 -3
@@ -5069,13 +5069,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 );
Martin K. Petersen
AppliedBart,
Quoted 10 lines
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_tbail;
| ^~~~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_tbail;
| ^~~~
Applied to 6.2/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 11 lines · Bart Van Assche
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_tbail;
| ^~~~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_tbail;
| ^~~~
Quoted 1 line
[...]
Applied to 6.2/scsi-queue, thanks!
[1/1] scsi: qla2xxx: Fix set-but-not-used variable warnings
https://git.kernel.org/mkp/scsi/c/4fb2169d66b8
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering