diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-06-27 14:57:03 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 04:04:52 -0700 |
| commit | 5076a1a97e2fa61c847a5fdd4b1991faf7716da6 (patch) | |
| tree | 251d207e75439da25d4d3a0353e0b853c8e79f2b /drivers/scsi/isci/sata.c | |
| parent | ba7cb22342a66505a831bb7e4541fef90e0193c9 (diff) | |
| download | kernel_samsung_tuna-5076a1a97e2fa61c847a5fdd4b1991faf7716da6.zip kernel_samsung_tuna-5076a1a97e2fa61c847a5fdd4b1991faf7716da6.tar.gz kernel_samsung_tuna-5076a1a97e2fa61c847a5fdd4b1991faf7716da6.tar.bz2 | |
isci: unify isci_request and scic_sds_request
They are one in the same object so remove the distinction. The near
duplicate fields (owning_controller, and isci_host) will be cleaned up
after the scic_sds_contoller isci_host unification.
Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/sata.c')
| -rw-r--r-- | drivers/scsi/isci/sata.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/isci/sata.c b/drivers/scsi/isci/sata.c index e7ce469..87d8cc1 100644 --- a/drivers/scsi/isci/sata.c +++ b/drivers/scsi/isci/sata.c @@ -70,7 +70,7 @@ struct host_to_dev_fis *isci_sata_task_to_fis_copy(struct sas_task *task) { struct isci_request *ireq = task->lldd_task; - struct host_to_dev_fis *fis = &ireq->sci.stp.cmd; + struct host_to_dev_fis *fis = &ireq->stp.cmd; memcpy(fis, &task->ata_task.fis, sizeof(struct host_to_dev_fis)); @@ -116,7 +116,7 @@ void isci_sata_set_ncq_tag( struct isci_request *request = task->lldd_task; register_fis->sector_count = qc->tag << 3; - scic_stp_io_request_set_ncq_tag(&request->sci, qc->tag); + scic_stp_io_request_set_ncq_tag(request, qc->tag); } /** @@ -154,7 +154,6 @@ void isci_request_process_stp_response(struct sas_task *task, enum sci_status isci_sata_management_task_request_build(struct isci_request *ireq) { - struct scic_sds_request *sci_req = &ireq->sci; struct isci_tmf *isci_tmf; enum sci_status status; @@ -167,7 +166,7 @@ enum sci_status isci_sata_management_task_request_build(struct isci_request *ire case isci_tmf_sata_srst_high: case isci_tmf_sata_srst_low: { - struct host_to_dev_fis *fis = &sci_req->stp.cmd; + struct host_to_dev_fis *fis = &ireq->stp.cmd; memset(fis, 0, sizeof(*fis)); @@ -188,7 +187,7 @@ enum sci_status isci_sata_management_task_request_build(struct isci_request *ire /* core builds the protocol specific request * based on the h2d fis. */ - status = scic_task_request_construct_sata(&ireq->sci); + status = scic_task_request_construct_sata(ireq); return status; } |