isci: removing intel_*.h headers

[pandora-kernel.git] / drivers / scsi / isci / remote_device.h

diff --git a/drivers/scsi/isci/remote_device.h b/drivers/scsi/isci/remote_device.h
index 04a2b54..c7db499 100644 (file)
--- a/drivers/scsi/isci/remote_device.h
+++ b/drivers/scsi/isci/remote_device.h
@@ -57,7 +57,6 @@
 #define _ISCI_REMOTE_DEVICE_H_
 #include <scsi/libsas.h>
 #include "sci_status.h"
-#include "intel_sas.h"
 #include "scu_remote_node_context.h"
 #include "remote_node_context.h"
 #include "port.h"
@@ -128,12 +127,6 @@ struct scic_sds_remote_device {
         * assigned in the state handlers and used in the state transition.
         */
        u32 not_ready_reason;
-
-       /**
-        * This field maintains the set of state handlers for the remote device
-        * object.  These are changed each time the remote device enters a new state.
-        */
-       const struct scic_sds_remote_device_state_handler *state_handlers;
 };
 
 struct isci_remote_device {
@@ -347,64 +340,6 @@ static inline bool dev_is_expander(struct domain_device *dev)
        return dev->dev_type == EDGE_DEV || dev->dev_type == FANOUT_DEV;
 }
 
-typedef enum sci_status (*scic_sds_remote_device_request_handler_t)(
-       struct scic_sds_remote_device *device,
-       struct scic_sds_request *request);
-
-typedef enum sci_status (*scic_sds_remote_device_high_priority_request_complete_handler_t)(
-       struct scic_sds_remote_device *device,
-       struct scic_sds_request *request,
-       void *,
-       enum sci_io_status);
-
-typedef enum sci_status (*scic_sds_remote_device_handler_t)(
-       struct scic_sds_remote_device *sci_dev);
-
-typedef enum sci_status (*scic_sds_remote_device_suspend_handler_t)(
-       struct scic_sds_remote_device *sci_dev,
-       u32 suspend_type);
-
-typedef enum sci_status (*scic_sds_remote_device_resume_handler_t)(
-       struct scic_sds_remote_device *sci_dev);
-
-typedef enum sci_status (*scic_sds_remote_device_frame_handler_t)(
-       struct scic_sds_remote_device *sci_dev,
-       u32 frame_index);
-
-typedef enum sci_status (*scic_sds_remote_device_event_handler_t)(
-       struct scic_sds_remote_device *sci_dev,
-       u32 event_code);
-
-typedef void (*scic_sds_remote_device_ready_not_ready_handler_t)(
-       struct scic_sds_remote_device *sci_dev);
-
-/**
- * struct scic_sds_remote_device_state_handler - This structure conains the
- *    state handlers that are needed to process requests for the SCU remote
- *    device objects.
- *
- *
- */
-struct scic_sds_remote_device_state_handler {
-       /**
-        * The start_task_handler specifies the method invoked when a user
-        * attempts to start a task management request for a remote device.
-        */
-       scic_sds_remote_device_request_handler_t start_task_handler;
-
-       /**
-        * The complete_task_handler specifies the method invoked when a user
-        * attempts to complete a task management request for a remote device.
-        */
-       scic_sds_remote_device_request_handler_t complete_task_handler;
-
-
-       scic_sds_remote_device_suspend_handler_t suspend_handler;
-       scic_sds_remote_device_resume_handler_t resume_handler;
-       scic_sds_remote_device_event_handler_t event_handler;
-       scic_sds_remote_device_frame_handler_t frame_handler;
-};
-
 /**
  * scic_sds_remote_device_increment_request_count() -
  *
@@ -447,15 +382,6 @@ struct scic_sds_remote_device_state_handler {
 #define scic_sds_remote_device_get_controller(sci_dev) \
        scic_sds_port_get_controller(scic_sds_remote_device_get_port(sci_dev))
 
-/**
- * scic_sds_remote_device_set_state_handlers() -
- *
- * This macro sets the remote device state handlers pointer and is set on entry
- * to each device state.
- */
-#define scic_sds_remote_device_set_state_handlers(sci_dev, handlers) \
-       ((sci_dev)->state_handlers = (handlers))
-
 /**
  * scic_sds_remote_device_get_port() -
  *