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>
diff --git a/drivers/scsi/isci/port.h b/drivers/scsi/isci/port.h
index 9a69128..fee6d80 100644
--- a/drivers/scsi/isci/port.h
+++ b/drivers/scsi/isci/port.h
@@ -84,7 +84,7 @@
/**
* This field contains the information for the base port state machine.
*/
- struct sci_base_state_machine state_machine;
+ struct sci_base_state_machine sm;
bool ready_exit;
@@ -224,7 +224,7 @@
* In this state no new IO operations are permitted.
* This state is entered from the STOPPING state.
*/
- SCI_BASE_PORT_STATE_STOPPED,
+ SCI_PORT_STOPPED,
/**
* This state indicates that the port is in the process of stopping.
@@ -232,33 +232,33 @@
* operations are allowed to complete.
* This state is entered from the READY state.
*/
- SCI_BASE_PORT_STATE_STOPPING,
+ SCI_PORT_STOPPING,
/**
* This state indicates the port is now ready. Thus, the user is
* able to perform IO operations on this port.
* This state is entered from the STARTING state.
*/
- SCI_BASE_PORT_STATE_READY,
+ SCI_PORT_READY,
/**
* The substate where the port is started and ready but has no
* active phys.
*/
- SCIC_SDS_PORT_READY_SUBSTATE_WAITING,
+ SCI_PORT_SUB_WAITING,
/**
* The substate where the port is started and ready and there is
* at least one phy operational.
*/
- SCIC_SDS_PORT_READY_SUBSTATE_OPERATIONAL,
+ SCI_PORT_SUB_OPERATIONAL,
/**
* The substate where the port is started and there was an
* add/remove phy event. This state is only used in Automatic
* Port Configuration Mode (APC)
*/
- SCIC_SDS_PORT_READY_SUBSTATE_CONFIGURING,
+ SCI_PORT_SUB_CONFIGURING,
/**
* This state indicates the port is in the process of performing a hard
@@ -266,14 +266,14 @@
* port.
* This state is entered from the READY state.
*/
- SCI_BASE_PORT_STATE_RESETTING,
+ SCI_PORT_RESETTING,
/**
* This state indicates the port has failed a reset request. This state
* is entered when a port reset request times out.
* This state is entered from the RESETTING state.
*/
- SCI_BASE_PORT_STATE_FAILED,
+ SCI_PORT_FAILED,
};