isci: uplevel register hardware data structures and unsolicited frame handling

[linux-2.6.git] / drivers / scsi / isci / remote_device.c

diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c
index a441c23b6859cf30e0725273cc1ea1b9609cf8b8..00334b9ccd806f9604ffe896c24141ee3a10e72e 100644 (file)
--- a/drivers/scsi/isci/remote_device.c
+++ b/drivers/scsi/isci/remote_device.c
@@ -57,16 +57,13 @@
 #include "port.h"
 #include "remote_device.h"
 #include "request.h"
-#include "scic_controller.h"
 #include "scic_io_request.h"
 #include "scic_phy.h"
 #include "scic_port.h"
-#include "scic_sds_controller.h"
 #include "scic_sds_phy.h"
 #include "scic_sds_port.h"
 #include "remote_node_context.h"
 #include "scic_sds_request.h"
-#include "sci_environment.h"
 #include "sci_util.h"
 #include "scu_event_codes.h"
 #include "task.h"
@@ -473,7 +470,7 @@ enum sci_status scic_sds_remote_device_start_io(struct scic_sds_controller *scic
        struct sci_base_state_machine *sm = &sci_dev->state_machine;
        enum scic_sds_remote_device_states state = sm->current_state_id;
        struct scic_sds_port *sci_port = sci_dev->owning_port;
-       struct isci_request *ireq = sci_req->ireq;
+       struct isci_request *ireq = sci_req_to_ireq(sci_req);
        enum sci_status status;
 
        switch (state) {