diff options
| author | Hannes Reinecke <hare@suse.de> | 2014-11-05 13:08:20 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-11-05 11:22:06 -0500 |
| commit | 1cbd772d9aaf6c697935cb855860b66cebacf950 (patch) | |
| tree | fe83656bbb9a39f4a8b85ebb6afce18b05492840 /drivers/scsi/isci | |
| parent | 9a23c1d6f0f5dbac4c9b73fa6cea7c9ee3d29074 (diff) | |
| download | op-kernel-dev-1cbd772d9aaf6c697935cb855860b66cebacf950.zip op-kernel-dev-1cbd772d9aaf6c697935cb855860b66cebacf950.tar.gz | |
libsas: use ata_dev_classify()
Use the ata device class from libata in libsas instead of checking
the supported command set and switch to using ata_dev_classify()
instead of our own method.
Cc: Tejun Heo <tj@kernel.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/scsi/isci')
| -rw-r--r-- | drivers/scsi/isci/request.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c index 56e3809..cfd0084 100644 --- a/drivers/scsi/isci/request.c +++ b/drivers/scsi/isci/request.c @@ -694,7 +694,7 @@ sci_io_request_construct_sata(struct isci_request *ireq, } /* ATAPI */ - if (dev->sata_dev.command_set == ATAPI_COMMAND_SET && + if (dev->sata_dev.class == ATA_DEV_ATAPI && task->ata_task.fis.command == ATA_CMD_PACKET) { sci_atapi_construct(ireq); return SCI_SUCCESS; @@ -2980,7 +2980,7 @@ static void sci_request_started_state_enter(struct sci_base_state_machine *sm) state = SCI_REQ_SMP_WAIT_RESP; } else if (task && sas_protocol_ata(task->task_proto) && !task->ata_task.use_ncq) { - if (dev->sata_dev.command_set == ATAPI_COMMAND_SET && + if (dev->sata_dev.class == ATA_DEV_ATAPI && task->ata_task.fis.command == ATA_CMD_PACKET) { state = SCI_REQ_ATAPI_WAIT_H2D; } else if (task->data_dir == DMA_NONE) { |
