Skip to content

Commit

Permalink
isci: rnc state machine table c99 conversion
Browse files Browse the repository at this point in the history 
This makes the subsequent patches to delete rnc->state_handler more
clear.

Signed-off-by: Jacek Danecki <Jacek.Danecki@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Jacek Danecki authored and Dan Williams committed Jul 3, 2011
1 parent b9988b8 commit a98a742
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 71 deletions.
124 changes: 57 additions & 67 deletions drivers/scsi/isci/remote_node_context.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,80 +788,70 @@ static enum sci_status scic_sds_remote_node_context_await_suspension_state_event
/* --------------------------------------------------------------------------- */

static struct scic_sds_remote_node_context_handlers
scic_sds_remote_node_context_state_handler_table[
SCIC_SDS_REMOTE_NODE_CONTEXT_MAX_STATES] =
{
/* SCIC_SDS_REMOTE_NODE_CONTEXT_INITIAL_STATE */
{
scic_sds_remote_node_context_default_destruct_handler,
scic_sds_remote_node_context_default_suspend_handler,
scic_sds_remote_node_context_initial_state_resume_handler,
scic_sds_remote_node_context_default_start_io_handler,
scic_sds_remote_node_context_default_start_task_handler,
scic_sds_remote_node_context_default_event_handler
scic_sds_remote_node_context_state_handler_table[] = {
[SCIC_SDS_REMOTE_NODE_CONTEXT_INITIAL_STATE] = {
.destruct_handler = scic_sds_remote_node_context_default_destruct_handler,
.suspend_handler = scic_sds_remote_node_context_default_suspend_handler,
.resume_handler = scic_sds_remote_node_context_initial_state_resume_handler,
.start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
.start_task_handler = scic_sds_remote_node_context_default_start_task_handler,
.event_handler = scic_sds_remote_node_context_default_event_handler
},
/* SCIC_SDS_REMOTE_NODE_CONTEXT_POSTING_STATE */
{
scic_sds_remote_node_context_general_destruct_handler,
scic_sds_remote_node_context_default_suspend_handler,
scic_sds_remote_node_context_continue_to_resume_handler,
scic_sds_remote_node_context_default_start_io_handler,
scic_sds_remote_node_context_default_start_task_handler,
scic_sds_remote_node_context_posting_state_event_handler
[SCIC_SDS_REMOTE_NODE_CONTEXT_POSTING_STATE] = {
.destruct_handler = scic_sds_remote_node_context_general_destruct_handler,
.suspend_handler = scic_sds_remote_node_context_default_suspend_handler,
.resume_handler = scic_sds_remote_node_context_continue_to_resume_handler,
.start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
.start_task_handler = scic_sds_remote_node_context_default_start_task_handler,
.event_handler = scic_sds_remote_node_context_posting_state_event_handler
},
/* SCIC_SDS_REMOTE_NODE_CONTEXT_INVALIDATING_STATE */
{
scic_sds_remote_node_context_invalidating_state_destruct_handler,
scic_sds_remote_node_context_default_suspend_handler,
scic_sds_remote_node_context_continue_to_resume_handler,
scic_sds_remote_node_context_default_start_io_handler,
scic_sds_remote_node_context_default_start_task_handler,
scic_sds_remote_node_context_invalidating_state_event_handler
[SCIC_SDS_REMOTE_NODE_CONTEXT_INVALIDATING_STATE] = {
.destruct_handler = scic_sds_remote_node_context_invalidating_state_destruct_handler,
.suspend_handler = scic_sds_remote_node_context_default_suspend_handler,
.resume_handler = scic_sds_remote_node_context_continue_to_resume_handler,
.start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
.start_task_handler = scic_sds_remote_node_context_default_start_task_handler,
.event_handler = scic_sds_remote_node_context_invalidating_state_event_handler
},
/* SCIC_SDS_REMOTE_NODE_CONTEXT_RESUMING_STATE */
{
scic_sds_remote_node_context_general_destruct_handler,
scic_sds_remote_node_context_default_suspend_handler,
scic_sds_remote_node_context_continue_to_resume_handler,
scic_sds_remote_node_context_default_start_io_handler,
scic_sds_remote_node_context_success_start_task_handler,
scic_sds_remote_node_context_resuming_state_event_handler
[SCIC_SDS_REMOTE_NODE_CONTEXT_RESUMING_STATE] = {
.destruct_handler = scic_sds_remote_node_context_general_destruct_handler,
.suspend_handler = scic_sds_remote_node_context_default_suspend_handler,
.resume_handler = scic_sds_remote_node_context_continue_to_resume_handler,
.start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
.start_task_handler = scic_sds_remote_node_context_success_start_task_handler,
.event_handler = scic_sds_remote_node_context_resuming_state_event_handler
},
/* SCIC_SDS_REMOTE_NODE_CONTEXT_READY_STATE */
{
scic_sds_remote_node_context_general_destruct_handler,
scic_sds_remote_node_context_ready_state_suspend_handler,
scic_sds_remote_node_context_default_resume_handler,
scic_sds_remote_node_context_ready_state_start_io_handler,
scic_sds_remote_node_context_success_start_task_handler,
scic_sds_remote_node_context_ready_state_event_handler
[SCIC_SDS_REMOTE_NODE_CONTEXT_READY_STATE] = {
.destruct_handler = scic_sds_remote_node_context_general_destruct_handler,
.suspend_handler = scic_sds_remote_node_context_ready_state_suspend_handler,
.resume_handler = scic_sds_remote_node_context_default_resume_handler,
.start_io_handler = scic_sds_remote_node_context_ready_state_start_io_handler,
.start_task_handler = scic_sds_remote_node_context_success_start_task_handler,
.event_handler = scic_sds_remote_node_context_ready_state_event_handler
},
/* SCIC_SDS_REMOTE_NODE_CONTEXT_TX_SUSPENDED_STATE */
{
scic_sds_remote_node_context_general_destruct_handler,
scic_sds_remote_node_context_default_suspend_handler,
scic_sds_remote_node_context_tx_suspended_state_resume_handler,
scic_sds_remote_node_context_default_start_io_handler,
scic_sds_remote_node_context_suspended_start_task_handler,
scic_sds_remote_node_context_default_event_handler
[SCIC_SDS_REMOTE_NODE_CONTEXT_TX_SUSPENDED_STATE] = {
.destruct_handler = scic_sds_remote_node_context_general_destruct_handler,
.suspend_handler = scic_sds_remote_node_context_default_suspend_handler,
.resume_handler = scic_sds_remote_node_context_tx_suspended_state_resume_handler,
.start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
.start_task_handler = scic_sds_remote_node_context_suspended_start_task_handler,
.event_handler = scic_sds_remote_node_context_default_event_handler
},
/* SCIC_SDS_REMOTE_NODE_CONTEXT_TX_RX_SUSPENDED_STATE */
{
scic_sds_remote_node_context_general_destruct_handler,
scic_sds_remote_node_context_default_suspend_handler,
scic_sds_remote_node_context_tx_rx_suspended_state_resume_handler,
scic_sds_remote_node_context_default_start_io_handler,
scic_sds_remote_node_context_suspended_start_task_handler,
scic_sds_remote_node_context_default_event_handler
[SCIC_SDS_REMOTE_NODE_CONTEXT_TX_RX_SUSPENDED_STATE] = {
.destruct_handler = scic_sds_remote_node_context_general_destruct_handler,
.suspend_handler = scic_sds_remote_node_context_default_suspend_handler,
.resume_handler = scic_sds_remote_node_context_tx_rx_suspended_state_resume_handler,
.start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
.start_task_handler = scic_sds_remote_node_context_suspended_start_task_handler,
.event_handler = scic_sds_remote_node_context_default_event_handler
},
/* SCIC_SDS_REMOTE_NODE_CONTEXT_AWAIT_SUSPENSION_STATE */
{
scic_sds_remote_node_context_general_destruct_handler,
scic_sds_remote_node_context_default_suspend_handler,
scic_sds_remote_node_context_await_suspension_state_resume_handler,
scic_sds_remote_node_context_default_start_io_handler,
scic_sds_remote_node_context_await_suspension_state_start_task_handler,
scic_sds_remote_node_context_await_suspension_state_event_handler
[SCIC_SDS_REMOTE_NODE_CONTEXT_AWAIT_SUSPENSION_STATE] = {
.destruct_handler = scic_sds_remote_node_context_general_destruct_handler,
.suspend_handler = scic_sds_remote_node_context_default_suspend_handler,
.resume_handler = scic_sds_remote_node_context_await_suspension_state_resume_handler,
.start_io_handler = scic_sds_remote_node_context_default_start_io_handler,
.start_task_handler = scic_sds_remote_node_context_await_suspension_state_start_task_handler,
.event_handler = scic_sds_remote_node_context_await_suspension_state_event_handler
}
};

Expand Down
5 changes: 1 addition & 4 deletions drivers/scsi/isci/remote_node_context.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,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,

SCIC_SDS_REMOTE_NODE_CONTEXT_MAX_STATES

SCIC_SDS_REMOTE_NODE_CONTEXT_AWAIT_SUSPENSION_STATE
};

/**
Expand Down

0 comments on commit a98a742

Please sign in to comment.