scsi: wd719: Stop using scsi_cmnd.tag
authorJohn Garry <john.garry@huawei.com>
Fri, 13 Aug 2021 13:49:11 +0000 (21:49 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 16 Aug 2021 17:33:24 +0000 (13:33 -0400)
Use scsi_cmd_to_rq(cmd)->tag instead.

Link: https://lore.kernel.org/r/1628862553-179450-2-git-send-email-john.garry@huawei.com
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/wd719x.c

index edc8a139a60d713857333e7a16dae0a258b6d553..6f10a43510fbd8bb6e9da9871a67d010cbf6554e 100644 (file)
@@ -466,14 +466,16 @@ static int wd719x_abort(struct scsi_cmnd *cmd)
        unsigned long flags;
        struct wd719x_scb *scb = scsi_cmd_priv(cmd);
        struct wd719x *wd = shost_priv(cmd->device->host);
+       struct device *dev = &wd->pdev->dev;
 
-       dev_info(&wd->pdev->dev, "abort command, tag: %x\n", cmd->tag);
+       dev_info(dev, "abort command, tag: %x\n", scsi_cmd_to_rq(cmd)->tag);
 
-       action = /*cmd->tag ? WD719X_CMD_ABORT_TAG : */WD719X_CMD_ABORT;
+       action = WD719X_CMD_ABORT;
 
        spin_lock_irqsave(wd->sh->host_lock, flags);
        result = wd719x_direct_cmd(wd, action, cmd->device->id,
-                                  cmd->device->lun, cmd->tag, scb->phys, 0);
+                                  cmd->device->lun, scsi_cmd_to_rq(cmd)->tag,
+                                  scb->phys, 0);
        wd719x_finish_cmd(scb, DID_ABORT);
        spin_unlock_irqrestore(wd->sh->host_lock, flags);
        if (result)