isci: Removed struct sci_base_object from state machine.

[deliverable/linux.git] / drivers / scsi / isci / core / scic_sds_controller.c

diff --git a/drivers/scsi/isci/core/scic_sds_controller.c b/drivers/scsi/isci/core/scic_sds_controller.c
index 5e8dea57b5ef1ba74825bd5f2348dfd50730d68d..135aa3e5e132da693047288dfdc788303149849b 100644 (file)
--- a/drivers/scsi/isci/core/scic_sds_controller.c
+++ b/drivers/scsi/isci/core/scic_sds_controller.c
@@ -2882,7 +2882,7 @@ enum sci_status scic_controller_start(struct scic_sds_controller *scic,
 
 /**
  *
- * @object: This is the struct sci_base_object which is cast to a struct scic_sds_controller
+ * @object: This is the object which is cast to a struct scic_sds_controller
  *    object.
  *
  * This method implements the actions taken by the struct scic_sds_controller on entry
@@ -2890,8 +2890,7 @@ enum sci_status scic_controller_start(struct scic_sds_controller *scic,
  * controllers initial state. none This function should initialze the
  * controller object.
  */
-static void scic_sds_controller_initial_state_enter(
-       struct sci_base_object *object)
+static void scic_sds_controller_initial_state_enter(void *object)
 {
        struct scic_sds_controller *scic;
 
@@ -2903,15 +2902,14 @@ static void scic_sds_controller_initial_state_enter(
 
 /**
  *
- * @object: This is the struct sci_base_object which is cast to a struct scic_sds_controller
+ * @object: This is the object which is cast to a struct scic_sds_controller
  *    object.
  *
  * This method implements the actions taken by the struct scic_sds_controller on exit
  * from the SCI_BASE_CONTROLLER_STATE_STARTING. - This function stops the
  * controller starting timeout timer. none
  */
-static inline void scic_sds_controller_starting_state_exit(
-       struct sci_base_object *object)
+static inline void scic_sds_controller_starting_state_exit(void *object)
 {
        struct scic_sds_controller *scic = (struct scic_sds_controller *)object;
 
@@ -2920,15 +2918,14 @@ static inline void scic_sds_controller_starting_state_exit(
 
 /**
  *
- * @object: This is the struct sci_base_object which is cast to a struct scic_sds_controller
+ * @object: This is the object which is cast to a struct scic_sds_controller
  *    object.
  *
  * This method implements the actions taken by the struct scic_sds_controller on entry
  * to the SCI_BASE_CONTROLLER_STATE_READY. - Set the state handlers to the
  * controllers ready state. none
  */
-static void scic_sds_controller_ready_state_enter(
-       struct sci_base_object *object)
+static void scic_sds_controller_ready_state_enter(void *object)
 {
        struct scic_sds_controller *scic;
 
@@ -2941,14 +2938,13 @@ static void scic_sds_controller_ready_state_enter(
 
 /**
  *
- * @object: This is the struct sci_base_object which is cast to a struct scic_sds_controller
+ * @object: This is the object which is cast to a struct scic_sds_controller
  *    object.
  *
  * This method implements the actions taken by the struct scic_sds_controller on exit
  * from the SCI_BASE_CONTROLLER_STATE_READY. - This function does nothing. none
  */
-static void scic_sds_controller_ready_state_exit(
-       struct sci_base_object *object)
+static void scic_sds_controller_ready_state_exit(void *object)
 {
        struct scic_sds_controller *scic;
 
@@ -2960,7 +2956,7 @@ static void scic_sds_controller_ready_state_exit(
 
 /**
  *
- * @object: This is the struct sci_base_object which is cast to a struct scic_sds_controller
+ * @object: This is the object which is cast to a struct scic_sds_controller
  *    object.
  *
  * This method implements the actions taken by the struct scic_sds_controller on entry
@@ -2968,8 +2964,7 @@ static void scic_sds_controller_ready_state_exit(
  * controllers ready state. - Stop the phys on this controller - Stop the ports
  * on this controller - Stop all of the remote devices on this controller none
  */
-static void scic_sds_controller_stopping_state_enter(
-       struct sci_base_object *object)
+static void scic_sds_controller_stopping_state_enter(void *object)
 {
        struct scic_sds_controller *scic;
 
@@ -2983,15 +2978,14 @@ static void scic_sds_controller_stopping_state_enter(
 
 /**
  *
- * @object: This is the struct sci_base_object which is cast to a struct
+ * @object: This is the object which is cast to a struct
  * scic_sds_controller object.
  *
  * This funciton implements the actions taken by the struct scic_sds_controller
  * on exit from the SCI_BASE_CONTROLLER_STATE_STOPPING. -
  * This function stops the controller stopping timeout timer.
  */
-static inline void scic_sds_controller_stopping_state_exit(
-       struct sci_base_object *object)
+static inline void scic_sds_controller_stopping_state_exit(void *object)
 {
        struct scic_sds_controller *scic =
                (struct scic_sds_controller *)object;
@@ -2999,7 +2993,7 @@ static inline void scic_sds_controller_stopping_state_exit(
        isci_timer_stop(scic->timeout_timer);
 }
 
-static void scic_sds_controller_resetting_state_enter(struct sci_base_object *object)
+static void scic_sds_controller_resetting_state_enter(void *object)
 {
        struct scic_sds_controller *scic;