Skip to content

L
linux
Commit c777c26c authored by Piotr Sawicki's avatar Piotr Sawicki Committed by Dan Williams
Browse files
Options

isci: c99 port state handlers 

Name the table fields for consistancy and clarity.
Signed-off-by: default avatarPiotr Sawicki <piotr.sawicki@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 4f20ef4f
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 121 deletions
drivers/scsi/isci/port.c
View file @ c777c26c
...@@ -1567,56 +1567,48 @@ static enum sci_status scic_sds_port_default_complete_io_handler(struct scic_sds ...@@ -1567,56 +1567,48 @@ static enum sci_status scic_sds_port_default_complete_io_handler(struct scic_sds
return default_port_handler(sci_port, __func__); return default_port_handler(sci_port, __func__);
} }
static struct scic_sds_port_state_handler scic_sds_port_ready_substate_handler_table[] = {
[SCIC_SDS_PORT_READY_SUBSTATE_WAITING] = {
static struct scic_sds_port_state_handler .start_handler = scic_sds_port_default_start_handler,
scic_sds_port_ready_substate_handler_table[SCIC_SDS_PORT_READY_MAX_SUBSTATES] = { .stop_handler = scic_sds_port_ready_substate_stop_handler,
{ .destruct_handler = scic_sds_port_default_destruct_handler,
/* SCIC_SDS_PORT_READY_SUBSTATE_WAITING */ .reset_handler = scic_sds_port_default_reset_handler,
scic_sds_port_default_start_handler, .add_phy_handler = scic_sds_port_ready_substate_add_phy_handler,
scic_sds_port_ready_substate_stop_handler, .remove_phy_handler = scic_sds_port_default_remove_phy_handler,
scic_sds_port_default_destruct_handler, .frame_handler = scic_sds_port_default_frame_handler,
scic_sds_port_default_reset_handler, .event_handler = scic_sds_port_default_event_handler,
scic_sds_port_ready_substate_add_phy_handler, .link_up_handler = scic_sds_port_ready_waiting_substate_link_up_handler,
scic_sds_port_default_remove_phy_handler, .link_down_handler = scic_sds_port_default_link_down_handler,
scic_sds_port_default_frame_handler, .start_io_handler = scic_sds_port_ready_waiting_substate_start_io_handler,
scic_sds_port_default_event_handler, .complete_io_handler = scic_sds_port_ready_substate_complete_io_handler,
scic_sds_port_ready_waiting_substate_link_up_handler,
scic_sds_port_default_link_down_handler,
scic_sds_port_ready_waiting_substate_start_io_handler,
scic_sds_port_ready_substate_complete_io_handler,
}, },
[SCIC_SDS_PORT_READY_SUBSTATE_OPERATIONAL] = {
{ .start_handler = scic_sds_port_default_start_handler,
/* SCIC_SDS_PORT_READY_SUBSTATE_OPERATIONAL */ .stop_handler = scic_sds_port_ready_substate_stop_handler,
scic_sds_port_default_start_handler, .destruct_handler = scic_sds_port_default_destruct_handler,
scic_sds_port_ready_substate_stop_handler, .reset_handler = scic_sds_port_ready_operational_substate_reset_handler,
scic_sds_port_default_destruct_handler, .add_phy_handler = scic_sds_port_ready_substate_add_phy_handler,
scic_sds_port_ready_operational_substate_reset_handler, .remove_phy_handler = scic_sds_port_ready_substate_remove_phy_handler,
scic_sds_port_ready_substate_add_phy_handler, .frame_handler = scic_sds_port_default_frame_handler,
scic_sds_port_ready_substate_remove_phy_handler, .event_handler = scic_sds_port_default_event_handler,
scic_sds_port_default_frame_handler, .link_up_handler = scic_sds_port_ready_operational_substate_link_up_handler,
scic_sds_port_default_event_handler, .link_down_handler = scic_sds_port_ready_operational_substate_link_down_handler,
scic_sds_port_ready_operational_substate_link_up_handler, .start_io_handler = scic_sds_port_ready_operational_substate_start_io_handler,
scic_sds_port_ready_operational_substate_link_down_handler, .complete_io_handler = scic_sds_port_ready_substate_complete_io_handler,
scic_sds_port_ready_operational_substate_start_io_handler,
scic_sds_port_ready_substate_complete_io_handler,
}, },
[SCIC_SDS_PORT_READY_SUBSTATE_CONFIGURING] = {
{ .start_handler = scic_sds_port_default_start_handler,
/* SCIC_SDS_PORT_READY_SUBSTATE_CONFIGURING */ .stop_handler = scic_sds_port_ready_substate_stop_handler,
scic_sds_port_default_start_handler, .destruct_handler = scic_sds_port_default_destruct_handler,
scic_sds_port_ready_substate_stop_handler, .reset_handler = scic_sds_port_default_reset_handler,
scic_sds_port_default_destruct_handler, .add_phy_handler = scic_sds_port_ready_configuring_substate_add_phy_handler,
scic_sds_port_default_reset_handler, .remove_phy_handler = scic_sds_port_ready_configuring_substate_remove_phy_handler,
scic_sds_port_ready_configuring_substate_add_phy_handler, .frame_handler = scic_sds_port_default_frame_handler,
scic_sds_port_ready_configuring_substate_remove_phy_handler, .event_handler = scic_sds_port_default_event_handler,
scic_sds_port_default_frame_handler, .link_up_handler = scic_sds_port_default_link_up_handler,
scic_sds_port_default_event_handler, .link_down_handler = scic_sds_port_default_link_down_handler,
scic_sds_port_default_link_up_handler, .start_io_handler = scic_sds_port_default_start_io_handler,
scic_sds_port_default_link_down_handler, .complete_io_handler = scic_sds_port_ready_configuring_substate_complete_io_handler
scic_sds_port_default_start_io_handler,
scic_sds_port_ready_configuring_substate_complete_io_handler
} }
}; };
...@@ -2166,83 +2158,76 @@ static void scic_sds_port_reset_state_link_down_handler( ...@@ -2166,83 +2158,76 @@ static void scic_sds_port_reset_state_link_down_handler(
scic_sds_port_deactivate_phy(port, phy, false); scic_sds_port_deactivate_phy(port, phy, false);
} }
static struct scic_sds_port_state_handler static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] = {
scic_sds_port_state_handler_table[SCI_BASE_PORT_MAX_STATES] = [SCI_BASE_PORT_STATE_STOPPED] = {
{ .start_handler = scic_sds_port_stopped_state_start_handler,
/* SCI_BASE_PORT_STATE_STOPPED */ .stop_handler = scic_sds_port_stopped_state_stop_handler,
{ .destruct_handler = scic_sds_port_stopped_state_destruct_handler,
scic_sds_port_stopped_state_start_handler, .reset_handler = scic_sds_port_default_reset_handler,
scic_sds_port_stopped_state_stop_handler, .add_phy_handler = scic_sds_port_stopped_state_add_phy_handler,
scic_sds_port_stopped_state_destruct_handler, .remove_phy_handler = scic_sds_port_stopped_state_remove_phy_handler,
scic_sds_port_default_reset_handler, .frame_handler = scic_sds_port_default_frame_handler,
scic_sds_port_stopped_state_add_phy_handler, .event_handler = scic_sds_port_default_event_handler,
scic_sds_port_stopped_state_remove_phy_handler, .link_up_handler = scic_sds_port_default_link_up_handler,
scic_sds_port_default_frame_handler, .link_down_handler = scic_sds_port_default_link_down_handler,
scic_sds_port_default_event_handler, .start_io_handler = scic_sds_port_default_start_io_handler,
scic_sds_port_default_link_up_handler, .complete_io_handler = scic_sds_port_default_complete_io_handler
scic_sds_port_default_link_down_handler,
scic_sds_port_default_start_io_handler,
scic_sds_port_default_complete_io_handler
}, },
/* SCI_BASE_PORT_STATE_STOPPING */ [SCI_BASE_PORT_STATE_STOPPING] = {
{ .start_handler = scic_sds_port_default_start_handler,
scic_sds_port_default_start_handler, .stop_handler = scic_sds_port_default_stop_handler,
scic_sds_port_default_stop_handler, .destruct_handler = scic_sds_port_default_destruct_handler,
scic_sds_port_default_destruct_handler, .reset_handler = scic_sds_port_default_reset_handler,
scic_sds_port_default_reset_handler, .add_phy_handler = scic_sds_port_default_add_phy_handler,
scic_sds_port_default_add_phy_handler, .remove_phy_handler = scic_sds_port_default_remove_phy_handler,
scic_sds_port_default_remove_phy_handler, .frame_handler = scic_sds_port_default_frame_handler,
scic_sds_port_default_frame_handler, .event_handler = scic_sds_port_default_event_handler,
scic_sds_port_default_event_handler, .link_up_handler = scic_sds_port_default_link_up_handler,
scic_sds_port_default_link_up_handler, .link_down_handler = scic_sds_port_default_link_down_handler,
scic_sds_port_default_link_down_handler, .start_io_handler = scic_sds_port_default_start_io_handler,
scic_sds_port_default_start_io_handler, .complete_io_handler = scic_sds_port_stopping_state_complete_io_handler
scic_sds_port_stopping_state_complete_io_handler
}, },
/* SCI_BASE_PORT_STATE_READY */ [SCI_BASE_PORT_STATE_READY] = {
{ .start_handler = scic_sds_port_default_start_handler,
scic_sds_port_default_start_handler, .stop_handler = scic_sds_port_default_stop_handler,
scic_sds_port_default_stop_handler, .destruct_handler = scic_sds_port_default_destruct_handler,
scic_sds_port_default_destruct_handler, .reset_handler = scic_sds_port_default_reset_handler,
scic_sds_port_default_reset_handler, .add_phy_handler = scic_sds_port_default_add_phy_handler,
scic_sds_port_default_add_phy_handler, .remove_phy_handler = scic_sds_port_default_remove_phy_handler,
scic_sds_port_default_remove_phy_handler, .frame_handler = scic_sds_port_default_frame_handler,
scic_sds_port_default_frame_handler, .event_handler = scic_sds_port_default_event_handler,
scic_sds_port_default_event_handler, .link_up_handler = scic_sds_port_default_link_up_handler,
scic_sds_port_default_link_up_handler, .link_down_handler = scic_sds_port_default_link_down_handler,
scic_sds_port_default_link_down_handler, .start_io_handler = scic_sds_port_default_start_io_handler,
scic_sds_port_default_start_io_handler, .complete_io_handler = scic_sds_port_general_complete_io_handler
scic_sds_port_general_complete_io_handler
}, },
/* SCI_BASE_PORT_STATE_RESETTING */ [SCI_BASE_PORT_STATE_RESETTING] = {
{ .start_handler = scic_sds_port_default_start_handler,
scic_sds_port_default_start_handler, .stop_handler = scic_sds_port_reset_state_stop_handler,
scic_sds_port_reset_state_stop_handler, .destruct_handler = scic_sds_port_default_destruct_handler,
scic_sds_port_default_destruct_handler, .reset_handler = scic_sds_port_default_reset_handler,
scic_sds_port_default_reset_handler, .add_phy_handler = scic_sds_port_default_add_phy_handler,
scic_sds_port_default_add_phy_handler, .remove_phy_handler = scic_sds_port_default_remove_phy_handler,
scic_sds_port_default_remove_phy_handler, .frame_handler = scic_sds_port_default_frame_handler,
scic_sds_port_default_frame_handler, .event_handler = scic_sds_port_default_event_handler,
scic_sds_port_default_event_handler, .link_up_handler = scic_sds_port_reset_state_link_up_handler,
scic_sds_port_reset_state_link_up_handler, .link_down_handler = scic_sds_port_reset_state_link_down_handler,
scic_sds_port_reset_state_link_down_handler, .start_io_handler = scic_sds_port_default_start_io_handler,
scic_sds_port_default_start_io_handler, .complete_io_handler = scic_sds_port_general_complete_io_handler
scic_sds_port_general_complete_io_handler
}, },
/* SCI_BASE_PORT_STATE_FAILED */ [SCI_BASE_PORT_STATE_FAILED] = {
{ .start_handler = scic_sds_port_default_start_handler,
scic_sds_port_default_start_handler, .stop_handler = scic_sds_port_default_stop_handler,
scic_sds_port_default_stop_handler, .destruct_handler = scic_sds_port_default_destruct_handler,
scic_sds_port_default_destruct_handler, .reset_handler = scic_sds_port_default_reset_handler,
scic_sds_port_default_reset_handler, .add_phy_handler = scic_sds_port_default_add_phy_handler,
scic_sds_port_default_add_phy_handler, .remove_phy_handler = scic_sds_port_default_remove_phy_handler,
scic_sds_port_default_remove_phy_handler, .frame_handler = scic_sds_port_default_frame_handler,
scic_sds_port_default_frame_handler, .event_handler = scic_sds_port_default_event_handler,
scic_sds_port_default_event_handler, .link_up_handler = scic_sds_port_default_link_up_handler,
scic_sds_port_default_link_up_handler, .link_down_handler = scic_sds_port_default_link_down_handler,
scic_sds_port_default_link_down_handler, .start_io_handler = scic_sds_port_default_start_io_handler,
scic_sds_port_default_start_io_handler, .complete_io_handler = scic_sds_port_general_complete_io_handler
scic_sds_port_general_complete_io_handler
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7