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/phy.h b/drivers/scsi/isci/phy.h
index da3f0f1..9d21d27 100644
--- a/drivers/scsi/isci/phy.h
+++ b/drivers/scsi/isci/phy.h
@@ -94,7 +94,7 @@
/**
* This field contains the information for the base phy state machine.
*/
- struct sci_base_state_machine state_machine;
+ struct sci_base_state_machine sm;
/**
* This field specifies the port object that owns/contains this phy.
@@ -410,7 +410,7 @@
/**
* Simply the initial state for the base domain state machine.
*/
- SCI_BASE_PHY_STATE_INITIAL,
+ SCI_PHY_INITIAL,
/**
* This state indicates that the phy has successfully been stopped.
@@ -420,7 +420,7 @@
* This state is entered from the READY state.
* This state is entered from the RESETTING state.
*/
- SCI_BASE_PHY_STATE_STOPPED,
+ SCI_PHY_STOPPED,
/**
* This state indicates that the phy is in the process of becomming
@@ -429,57 +429,57 @@
* This state is entered from the READY state.
* This state is entered from the RESETTING state.
*/
- SCI_BASE_PHY_STATE_STARTING,
+ SCI_PHY_STARTING,
/**
* Initial state
*/
- SCIC_SDS_PHY_STARTING_SUBSTATE_INITIAL,
+ SCI_PHY_SUB_INITIAL,
/**
* Wait state for the hardware OSSP event type notification
*/
- SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_OSSP_EN,
+ SCI_PHY_SUB_AWAIT_OSSP_EN,
/**
* Wait state for the PHY speed notification
*/
- SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SAS_SPEED_EN,
+ SCI_PHY_SUB_AWAIT_SAS_SPEED_EN,
/**
* Wait state for the IAF Unsolicited frame notification
*/
- SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_IAF_UF,
+ SCI_PHY_SUB_AWAIT_IAF_UF,
/**
* Wait state for the request to consume power
*/
- SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SAS_POWER,
+ SCI_PHY_SUB_AWAIT_SAS_POWER,
/**
* Wait state for request to consume power
*/
- SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SATA_POWER,
+ SCI_PHY_SUB_AWAIT_SATA_POWER,
/**
* Wait state for the SATA PHY notification
*/
- SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SATA_PHY_EN,
+ SCI_PHY_SUB_AWAIT_SATA_PHY_EN,
/**
* Wait for the SATA PHY speed notification
*/
- SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SATA_SPEED_EN,
+ SCI_PHY_SUB_AWAIT_SATA_SPEED_EN,
/**
* Wait state for the SIGNATURE FIS unsolicited frame notification
*/
- SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SIG_FIS_UF,
+ SCI_PHY_SUB_AWAIT_SIG_FIS_UF,
/**
* Exit state for this state machine
*/
- SCIC_SDS_PHY_STARTING_SUBSTATE_FINAL,
+ SCI_PHY_SUB_FINAL,
/**
* This state indicates the the phy is now ready. Thus, the user
@@ -487,19 +487,19 @@
* is currently part of a valid port.
* This state is entered from the STARTING state.
*/
- SCI_BASE_PHY_STATE_READY,
+ SCI_PHY_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,
+ SCI_PHY_RESETTING,
/**
* Simply the final state for the base phy state machine.
*/
- SCI_BASE_PHY_STATE_FINAL,
+ SCI_PHY_FINAL,
};
/**