isci: unify phy event handlers

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / isci / phy.h

diff --git a/drivers/scsi/isci/phy.h b/drivers/scsi/isci/phy.h
index f1800368eda5b638b44278a1575b26092bf73266..a95c74e5869520d9a942b2596873acec97582cb2 100644 (file)
--- a/drivers/scsi/isci/phy.h
+++ b/drivers/scsi/isci/phy.h
@@ -142,8 +142,6 @@ struct scic_sds_phy {
 
        const struct scic_sds_phy_state_handler *state_handlers;
 
-       struct sci_base_state_machine starting_substate_machine;
-
        /**
         * This field is the pointer to the transport layer register for the SCU
         * hardware.
@@ -435,34 +433,6 @@ enum scic_sds_phy_states {
         */
        SCI_BASE_PHY_STATE_STARTING,
 
-       /**
-        * This state indicates the the phy is now ready.  Thus, the user
-        * is able to perform IO operations utilizing this phy as long as it
-        * is currently part of a valid port.
-        * This state is entered from the STARTING state.
-        */
-       SCI_BASE_PHY_STATE_READY,
-
-       /**
-        * This state indicates that the phy is in the process of being reset.
-        * In this state no new IO operations are permitted on this phy.
-        * This state is entered from the READY state.
-        */
-       SCI_BASE_PHY_STATE_RESETTING,
-
-       /**
-        * Simply the final state for the base phy state machine.
-        */
-       SCI_BASE_PHY_STATE_FINAL,
-};
-
-
-/**
- * enum scic_sds_phy_starting_substates -
- *
- *
- */
-enum scic_sds_phy_starting_substates {
        /**
         * Initial state
         */
@@ -512,50 +482,35 @@ enum scic_sds_phy_starting_substates {
         * Exit state for this state machine
         */
        SCIC_SDS_PHY_STARTING_SUBSTATE_FINAL,
-};
-
-
 
-typedef enum sci_status (*scic_sds_phy_handler_t)(struct scic_sds_phy *);
-typedef enum sci_status (*scic_sds_phy_event_handler_t)(struct scic_sds_phy *, u32);
-typedef enum sci_status (*scic_sds_phy_frame_handler_t)(struct scic_sds_phy *, u32);
-typedef enum sci_status (*scic_sds_phy_power_handler_t)(struct scic_sds_phy *);
-
-struct scic_sds_phy_state_handler {
        /**
-        * The start_handler specifies the method invoked when there is an
-        * attempt to start a phy.
-        */
-       scic_sds_phy_handler_t start_handler;
-
-       /**
-        * The stop_handler specifies the method invoked when there is an
-        * attempt to stop a phy.
+        * This state indicates the the phy is now ready.  Thus, the user
+        * is able to perform IO operations utilizing this phy as long as it
+        * is currently part of a valid port.
+        * This state is entered from the STARTING state.
         */
-       scic_sds_phy_handler_t stop_handler;
+       SCI_BASE_PHY_STATE_READY,
 
        /**
-        * The reset_handler specifies the method invoked when there is an
-        * attempt to reset a phy.
+        * This state indicates that the phy is in the process of being reset.
+        * In this state no new IO operations are permitted on this phy.
+        * This state is entered from the READY state.
         */
-       scic_sds_phy_handler_t reset_handler;
+       SCI_BASE_PHY_STATE_RESETTING,
 
        /**
-        * The destruct_handler specifies the method invoked when attempting to
-        * destruct a phy.
+        * Simply the final state for the base phy state machine.
         */
-       scic_sds_phy_handler_t destruct_handler;
+       SCI_BASE_PHY_STATE_FINAL,
+};
 
-       /**
-        * The state handler for unsolicited frames received from the SCU hardware.
-        */
-       scic_sds_phy_frame_handler_t frame_handler;
 
-       /**
-        * The state handler for events received from the SCU hardware.
-        */
-       scic_sds_phy_event_handler_t event_handler;
+typedef enum sci_status (*scic_sds_phy_handler_t)(struct scic_sds_phy *);
+typedef enum sci_status (*scic_sds_phy_event_handler_t)(struct scic_sds_phy *, u32);
+typedef enum sci_status (*scic_sds_phy_frame_handler_t)(struct scic_sds_phy *, u32);
+typedef enum sci_status (*scic_sds_phy_power_handler_t)(struct scic_sds_phy *);
 
+struct scic_sds_phy_state_handler {
        /**
         * The state handler for staggered spinup.
         */