diff options
author | Hannes Reinecke <hare@suse.de> | 2014-11-05 07:08:20 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-11-05 11:22:06 -0500 |
commit | 1cbd772d9aaf6c697935cb855860b66cebacf950 (patch) | |
tree | fe83656bbb9a39f4a8b85ebb6afce18b05492840 /drivers/scsi/isci | |
parent | 9a23c1d6f0f5dbac4c9b73fa6cea7c9ee3d29074 (diff) |
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 56e38096f0c4..cfd0084f1cd2 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, | |||
694 | } | 694 | } |
695 | 695 | ||
696 | /* ATAPI */ | 696 | /* ATAPI */ |
697 | if (dev->sata_dev.command_set == ATAPI_COMMAND_SET && | 697 | if (dev->sata_dev.class == ATA_DEV_ATAPI && |
698 | task->ata_task.fis.command == ATA_CMD_PACKET) { | 698 | task->ata_task.fis.command == ATA_CMD_PACKET) { |
699 | sci_atapi_construct(ireq); | 699 | sci_atapi_construct(ireq); |
700 | return SCI_SUCCESS; | 700 | return SCI_SUCCESS; |
@@ -2980,7 +2980,7 @@ static void sci_request_started_state_enter(struct sci_base_state_machine *sm) | |||
2980 | state = SCI_REQ_SMP_WAIT_RESP; | 2980 | state = SCI_REQ_SMP_WAIT_RESP; |
2981 | } else if (task && sas_protocol_ata(task->task_proto) && | 2981 | } else if (task && sas_protocol_ata(task->task_proto) && |
2982 | !task->ata_task.use_ncq) { | 2982 | !task->ata_task.use_ncq) { |
2983 | if (dev->sata_dev.command_set == ATAPI_COMMAND_SET && | 2983 | if (dev->sata_dev.class == ATA_DEV_ATAPI && |
2984 | task->ata_task.fis.command == ATA_CMD_PACKET) { | 2984 | task->ata_task.fis.command == ATA_CMD_PACKET) { |
2985 | state = SCI_REQ_ATAPI_WAIT_H2D; | 2985 | state = SCI_REQ_ATAPI_WAIT_H2D; |
2986 | } else if (task->data_dir == DMA_NONE) { | 2986 | } else if (task->data_dir == DMA_NONE) { |