| Message ID | 20190411215325.122837-9-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | bb63e47b6f6832f1eb5be4207c65a6f268e01059 |
| Headers | show |
| Series | Improve qla2xxx coding style | expand |
diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index 37e342f12787..727dd52963c2 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h @@ -890,8 +890,6 @@ struct qla_tgt_cmd { unsigned int cmd_sent_to_fw:1; unsigned int cmd_in_wq:1; unsigned int aborted:1; - unsigned int data_work:1; - unsigned int data_work_free:1; unsigned int released:1; struct scatterlist *sg; /* cmd data buffer SG vector */ diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c index 55c107361a14..7f9d5461023a 100644 --- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c +++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c @@ -500,9 +500,7 @@ static void tcm_qla2xxx_handle_data_work(struct work_struct *work) return; } - cmd->data_work = 1; if (cmd->aborted) { - cmd->data_work_free = 1; spin_unlock_irqrestore(&cmd->cmd_lock, flags); tcm_qla2xxx_free_cmd(cmd);
The 'data_work' and 'data_work_free' member variables are set but never used. Hence remove both member variables. See also commit 6bcbb3174caa ("qla2xxx: Fix incorrect tcm_qla2xxx_free_cmd use during TMR ABORT (v2)"). Cc: Himanshu Madhani <hmadhani@marvell.com> Cc: Giridhar Malavali <gmalavali@marvell.com> Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/scsi/qla2xxx/qla_target.h | 2 -- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 -- 2 files changed, 4 deletions(-)