diff options
Diffstat (limited to 'drivers/scsi/isci/host.h')
-rw-r--r-- | drivers/scsi/isci/host.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h index 446fade19b3a..0b26d25c19a9 100644 --- a/drivers/scsi/isci/host.h +++ b/drivers/scsi/isci/host.h | |||
@@ -64,7 +64,7 @@ | |||
64 | #include "unsolicited_frame_control.h" | 64 | #include "unsolicited_frame_control.h" |
65 | #include "probe_roms.h" | 65 | #include "probe_roms.h" |
66 | 66 | ||
67 | struct scic_sds_request; | 67 | struct isci_request; |
68 | struct scu_task_context; | 68 | struct scu_task_context; |
69 | 69 | ||
70 | 70 | ||
@@ -601,7 +601,7 @@ union scu_remote_node_context *scic_sds_controller_get_remote_node_context_buffe | |||
601 | struct scic_sds_controller *scic, | 601 | struct scic_sds_controller *scic, |
602 | u16 node_id); | 602 | u16 node_id); |
603 | 603 | ||
604 | struct scic_sds_request *scic_request_by_tag(struct scic_sds_controller *scic, | 604 | struct isci_request *scic_request_by_tag(struct scic_sds_controller *scic, |
605 | u16 io_tag); | 605 | u16 io_tag); |
606 | 606 | ||
607 | void scic_sds_controller_power_control_queue_insert( | 607 | void scic_sds_controller_power_control_queue_insert( |
@@ -628,11 +628,11 @@ void scic_sds_controller_remote_device_stopped( | |||
628 | 628 | ||
629 | void scic_sds_controller_copy_task_context( | 629 | void scic_sds_controller_copy_task_context( |
630 | struct scic_sds_controller *scic, | 630 | struct scic_sds_controller *scic, |
631 | struct scic_sds_request *this_request); | 631 | struct isci_request *ireq); |
632 | 632 | ||
633 | void scic_sds_controller_register_setup(struct scic_sds_controller *scic); | 633 | void scic_sds_controller_register_setup(struct scic_sds_controller *scic); |
634 | 634 | ||
635 | enum sci_status scic_controller_continue_io(struct scic_sds_request *sci_req); | 635 | enum sci_status scic_controller_continue_io(struct isci_request *ireq); |
636 | int isci_host_scan_finished(struct Scsi_Host *, unsigned long); | 636 | int isci_host_scan_finished(struct Scsi_Host *, unsigned long); |
637 | void isci_host_scan_start(struct Scsi_Host *); | 637 | void isci_host_scan_start(struct Scsi_Host *); |
638 | u16 isci_alloc_tag(struct isci_host *ihost); | 638 | u16 isci_alloc_tag(struct isci_host *ihost); |
@@ -665,22 +665,22 @@ void scic_controller_disable_interrupts( | |||
665 | enum sci_status scic_controller_start_io( | 665 | enum sci_status scic_controller_start_io( |
666 | struct scic_sds_controller *scic, | 666 | struct scic_sds_controller *scic, |
667 | struct scic_sds_remote_device *remote_device, | 667 | struct scic_sds_remote_device *remote_device, |
668 | struct scic_sds_request *io_request); | 668 | struct isci_request *ireq); |
669 | 669 | ||
670 | enum sci_task_status scic_controller_start_task( | 670 | enum sci_task_status scic_controller_start_task( |
671 | struct scic_sds_controller *scic, | 671 | struct scic_sds_controller *scic, |
672 | struct scic_sds_remote_device *remote_device, | 672 | struct scic_sds_remote_device *remote_device, |
673 | struct scic_sds_request *task_request); | 673 | struct isci_request *ireq); |
674 | 674 | ||
675 | enum sci_status scic_controller_terminate_request( | 675 | enum sci_status scic_controller_terminate_request( |
676 | struct scic_sds_controller *scic, | 676 | struct scic_sds_controller *scic, |
677 | struct scic_sds_remote_device *remote_device, | 677 | struct scic_sds_remote_device *remote_device, |
678 | struct scic_sds_request *request); | 678 | struct isci_request *ireq); |
679 | 679 | ||
680 | enum sci_status scic_controller_complete_io( | 680 | enum sci_status scic_controller_complete_io( |
681 | struct scic_sds_controller *scic, | 681 | struct scic_sds_controller *scic, |
682 | struct scic_sds_remote_device *remote_device, | 682 | struct scic_sds_remote_device *remote_device, |
683 | struct scic_sds_request *io_request); | 683 | struct isci_request *ireq); |
684 | 684 | ||
685 | void scic_sds_port_configuration_agent_construct( | 685 | void scic_sds_port_configuration_agent_construct( |
686 | struct scic_sds_port_configuration_agent *port_agent); | 686 | struct scic_sds_port_configuration_agent *port_agent); |