isci: state machine cleanup

This cleans up several areas of the state machine mechanism:

 o Rename sci_base_state_machine_change_state to sci_change_state
 o Remove sci_base_state_machine_get_state function
 o Rename 'state_machine' struct member to 'sm' in client structs
 o Shorten the name of request states
 o Shorten state machine state names as follows:
        SCI_BASE_CONTROLLER_STATE_xxx to SCIC_xxx
        SCI_BASE_PHY_STATE_xxx to SCI_PHY_xxx
        SCIC_SDS_PHY_STARTING_SUBSTATE_xxx to SCI_PHY_SUB_xxx
        SCI_BASE_PORT_STATE_xxx to SCI_PORT_xxx and
        SCIC_SDS_PORT_READY_SUBSTATE_xxx to SCI_PORT_SUB_xxx
        SCI_BASE_REMOTE_DEVICE_STATE_xxx to SCI_DEV_xxx
        SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_xxx to SCI_STP_DEV_xxx
        SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_xxx to SCI_SMP_DEV_xxx
        SCIC_SDS_REMOTE_NODE_CONTEXT_xxx_STATE to SCI_RNC_xxx

Signed-off-by: Edmund Nadolski <edmund.nadolski@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/scsi/isci/remote_node_context.h b/drivers/scsi/isci/remote_node_context.h
index f53329f782c8..e6c7248be3f6 100644
--- a/drivers/scsi/isci/remote_node_context.h
+++ b/drivers/scsi/isci/remote_node_context.h
@@ -92,45 +92,45 @@ enum scis_sds_remote_node_context_states {
          * This state is the initial state for a remote node context.  On a resume
          * request the remote node context will transition to the posting state.
          */
-        SCIC_SDS_REMOTE_NODE_CONTEXT_INITIAL_STATE,
+        SCI_RNC_INITIAL,
 
         /**
          * This is a transition state that posts the RNi to the hardware. Once the RNC
          * is posted the remote node context will be made ready.
          */
-        SCIC_SDS_REMOTE_NODE_CONTEXT_POSTING_STATE,
+        SCI_RNC_POSTING,
 
         /**
          * This is a transition state that will post an RNC invalidate to the
          * hardware.  Once the invalidate is complete the remote node context will
          * transition to the posting state.
          */
-        SCIC_SDS_REMOTE_NODE_CONTEXT_INVALIDATING_STATE,
+        SCI_RNC_INVALIDATING,
 
         /**
          * This is a transition state that will post an RNC resume to the hardare.
          * Once the event notification of resume complete is received the remote node
          * context will transition to the ready state.
          */
-        SCIC_SDS_REMOTE_NODE_CONTEXT_RESUMING_STATE,
+        SCI_RNC_RESUMING,
 
         /**
          * This is the state that the remote node context must be in to accept io
          * request operations.
          */
-        SCIC_SDS_REMOTE_NODE_CONTEXT_READY_STATE,
+        SCI_RNC_READY,
 
         /**
          * This is the state that the remote node context transitions to when it gets
          * a TX suspend notification from the hardware.
          */
-        SCIC_SDS_REMOTE_NODE_CONTEXT_TX_SUSPENDED_STATE,
+        SCI_RNC_TX_SUSPENDED,
 
         /**
          * This is the state that the remote node context transitions to when it gets
          * a TX RX suspend notification from the hardware.
          */
-        SCIC_SDS_REMOTE_NODE_CONTEXT_TX_RX_SUSPENDED_STATE,
+        SCI_RNC_TX_RX_SUSPENDED,
 
         /**
          * This state is a wait state for the remote node context that waits for a
@@ -138,7 +138,7 @@ enum scis_sds_remote_node_context_states {
          * there is a request to supend the remote node context or when there is a TC
          * completion where the remote node will be suspended by the hardware.
          */
-        SCIC_SDS_REMOTE_NODE_CONTEXT_AWAIT_SUSPENSION_STATE
+        SCI_RNC_AWAIT_SUSPENSION
 };
 
 /**
@@ -194,7 +194,7 @@ struct scic_sds_remote_node_context {
         /**
          * This field contains the data for the object's state machine.
          */
-        struct sci_base_state_machine state_machine;
+        struct sci_base_state_machine sm;
 };
 
 void scic_sds_remote_node_context_construct(struct scic_sds_remote_node_context *rnc,