---

yaml
---
r: 254431
b: refs/heads/master
c: 9a0fff7
h: refs/heads/master
i:
  254429: 98f458a
  254427: a29a363
  254423: eafb844
  254415: d5dcbda
  254399: 7164e59
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e76d80579c2b5b4ecac107b83c22ceeb9e23bd1b
+refs/heads/master: 9a0fff7bf0ffd4f57fc71d8075a92008b606eb61

trunk/drivers/scsi/isci/core/sci_base_state.h

@@ -58,13 +58,9 @@
 
 #include "sci_object.h"
 
-typedef void (*sci_base_state_handler_t)(
-	void
-	);
+typedef void (*sci_base_state_handler_t)(void);
 
-typedef void (*sci_state_transition_t)(
-	struct sci_base_object *base_object
-	);
+typedef void (*sci_state_transition_t)(void *base_object);
 
 /**
  * struct sci_base_state - The base state object abstracts the fields common to

trunk/drivers/scsi/isci/core/sci_base_state_machine.c

@@ -100,7 +100,7 @@ static void sci_state_machine_enter_state(struct sci_base_state_machine *sm)
  *
  */
 void sci_base_state_machine_construct(struct sci_base_state_machine *sm,
-				      struct sci_base_object *owner,
+				      void *owner,
 				      const struct sci_base_state *state_table,
 				      u32 initial_state)
 {

trunk/drivers/scsi/isci/core/sci_base_state_machine.h

@@ -94,7 +94,7 @@ struct sci_base_state_machine {
 	 * associated.  It serves as a cookie to be provided to the state
 	 * enter/exit methods.
 	 */
-	struct sci_base_object *state_machine_owner;
+	void *state_machine_owner;
 
 	/**
 	 * This field simply indicates the state value for the state machine's
@@ -121,7 +121,7 @@ struct sci_base_state_machine {
 
 void sci_base_state_machine_construct(
 	struct sci_base_state_machine *this_state_machine,
-	struct sci_base_object *state_machine_owner,
+	void *state_machine_owner,
 	const struct sci_base_state *state_table,
 	u32 initial_state);
 

trunk/drivers/scsi/isci/core/scic_sds_controller.c

@@ -2882,16 +2882,15 @@ 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
  * to the SCI_BASE_CONTROLLER_STATE_INITIAL. - Set the state handlers to the
  * 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,16 +2956,15 @@ 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
  * to the SCI_BASE_CONTROLLER_STATE_READY. - Set the state handlers to the
  * 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,23 +2978,22 @@ 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;
 
 	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;