diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-07-01 02:38:32 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 13:04:52 +0200 |
| commit | d9dcb4ba791de2a06b19ac47cd61601cf3d4e208 (patch) | |
| tree | 4b818b5b14c078703c034489c92e74975be6c06f /drivers/scsi/isci/request.h | |
| parent | isci: unify isci_remote_device and scic_sds_remote_device (diff) | |
| download | linux-d9dcb4ba791de2a06b19ac47cd61601cf3d4e208.tar.xz linux-d9dcb4ba791de2a06b19ac47cd61601cf3d4e208.zip | |
isci: unify isci_host and scic_sds_controller
Remove the distinction between these two implementations and unify on
isci_host (local instances named ihost). Hmmm, we had two
'oem_parameters' instances, one was unused... nice.
Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/request.h')
| -rw-r--r-- | drivers/scsi/isci/request.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h index ca64ea207ac8..0cafcead7a01 100644 --- a/drivers/scsi/isci/request.h +++ b/drivers/scsi/isci/request.h @@ -145,7 +145,7 @@ struct isci_request { */ struct completion *io_request_completion; struct sci_base_state_machine sm; - struct scic_sds_controller *owning_controller; + struct isci_host *owning_controller; struct isci_remote_device *target_device; u16 io_tag; enum sci_request_protocol protocol; @@ -500,7 +500,7 @@ int isci_request_execute(struct isci_host *ihost, struct isci_remote_device *ide void isci_terminate_pending_requests(struct isci_host *ihost, struct isci_remote_device *idev); enum sci_status -scic_task_request_construct(struct scic_sds_controller *scic, +scic_task_request_construct(struct isci_host *ihost, struct isci_remote_device *idev, u16 io_tag, struct isci_request *ireq); |