aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/port.c
diff options
context:
space:
mode:
authorPiotr Sawicki <piotr.sawicki@intel.com>2011-05-11 19:52:37 -0400
committerDan Williams <dan.j.williams@intel.com>2011-07-03 07:04:49 -0400
commite6ec5afde9794f50e60788bd10760fcd0d609252 (patch)
treee72faa18266238c021d7023a492e1ff70f561924 /drivers/scsi/isci/port.c
parent8bc80d303063d9540493be623df1c9a8dee9ccb8 (diff)
isci: remove port destruct handler
The handler was never used. Signed-off-by: Piotr Sawicki <piotr.sawicki@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/port.c')
-rw-r--r--drivers/scsi/isci/port.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c
index 62e9785acfb0..1a058a27ebc1 100644
--- a/drivers/scsi/isci/port.c
+++ b/drivers/scsi/isci/port.c
@@ -885,13 +885,6 @@ static void port_state_machine_change(struct scic_sds_port *sci_port,
885 sci_port->ready_exit = false; 885 sci_port->ready_exit = false;
886} 886}
887 887
888static void port_state_machine_stop(struct scic_sds_port *sci_port)
889{
890 sci_port->ready_exit = true;
891 sci_base_state_machine_stop(&sci_port->state_machine);
892 sci_port->ready_exit = false;
893}
894
895/** 888/**
896 * scic_sds_port_general_link_up_handler - phy can be assigned to port? 889 * scic_sds_port_general_link_up_handler - phy can be assigned to port?
897 * @sci_port: scic_sds_port object for which has a phy that has gone link up. 890 * @sci_port: scic_sds_port object for which has a phy that has gone link up.
@@ -1469,12 +1462,6 @@ static enum sci_status default_port_handler(struct scic_sds_port *sci_port,
1469} 1462}
1470 1463
1471static enum sci_status 1464static enum sci_status
1472scic_sds_port_default_destruct_handler(struct scic_sds_port *sci_port)
1473{
1474 return default_port_handler(sci_port, __func__);
1475}
1476
1477static enum sci_status
1478scic_sds_port_default_reset_handler(struct scic_sds_port *sci_port, 1465scic_sds_port_default_reset_handler(struct scic_sds_port *sci_port,
1479 u32 timeout) 1466 u32 timeout)
1480{ 1467{
@@ -1832,19 +1819,6 @@ static enum sci_status scic_sds_port_general_complete_io_handler(
1832 1819
1833/* 1820/*
1834 * This method takes the struct scic_sds_port that is in a stopped state and handles 1821 * This method takes the struct scic_sds_port that is in a stopped state and handles
1835 * the destruct request. The stopped state is the only state in which the
1836 * struct scic_sds_port can be destroyed. This function causes the port object to
1837 * transition to the SCI_BASE_PORT_STATE_FINAL. enum sci_status SCI_SUCCESS
1838 */
1839static enum sci_status scic_sds_port_stopped_state_destruct_handler(struct scic_sds_port *port)
1840{
1841 port_state_machine_stop(port);
1842
1843 return SCI_SUCCESS;
1844}
1845
1846/*
1847 * This method takes the struct scic_sds_port that is in a stopped state and handles
1848 * the add phy request. In MPC mode the only time a phy can be added to a port 1822 * the add phy request. In MPC mode the only time a phy can be added to a port
1849 * is in the SCI_BASE_PORT_STATE_STOPPED. enum sci_status 1823 * is in the SCI_BASE_PORT_STATE_STOPPED. enum sci_status
1850 * SCI_FAILURE_UNSUPPORTED_PORT_CONFIGURATION is returned when the phy can not 1824 * SCI_FAILURE_UNSUPPORTED_PORT_CONFIGURATION is returned when the phy can not
@@ -2072,7 +2046,6 @@ enum sci_status scic_sds_port_stop(struct scic_sds_port *sci_port)
2072 2046
2073static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] = { 2047static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] = {
2074 [SCI_BASE_PORT_STATE_STOPPED] = { 2048 [SCI_BASE_PORT_STATE_STOPPED] = {
2075 .destruct_handler = scic_sds_port_stopped_state_destruct_handler,
2076 .reset_handler = scic_sds_port_default_reset_handler, 2049 .reset_handler = scic_sds_port_default_reset_handler,
2077 .add_phy_handler = scic_sds_port_stopped_state_add_phy_handler, 2050 .add_phy_handler = scic_sds_port_stopped_state_add_phy_handler,
2078 .remove_phy_handler = scic_sds_port_stopped_state_remove_phy_handler, 2051 .remove_phy_handler = scic_sds_port_stopped_state_remove_phy_handler,
@@ -2084,7 +2057,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
2084 .complete_io_handler = scic_sds_port_default_complete_io_handler 2057 .complete_io_handler = scic_sds_port_default_complete_io_handler
2085 }, 2058 },
2086 [SCI_BASE_PORT_STATE_STOPPING] = { 2059 [SCI_BASE_PORT_STATE_STOPPING] = {
2087 .destruct_handler = scic_sds_port_default_destruct_handler,
2088 .reset_handler = scic_sds_port_default_reset_handler, 2060 .reset_handler = scic_sds_port_default_reset_handler,
2089 .add_phy_handler = scic_sds_port_default_add_phy_handler, 2061 .add_phy_handler = scic_sds_port_default_add_phy_handler,
2090 .remove_phy_handler = scic_sds_port_default_remove_phy_handler, 2062 .remove_phy_handler = scic_sds_port_default_remove_phy_handler,
@@ -2096,7 +2068,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
2096 .complete_io_handler = scic_sds_port_stopping_state_complete_io_handler 2068 .complete_io_handler = scic_sds_port_stopping_state_complete_io_handler
2097 }, 2069 },
2098 [SCI_BASE_PORT_STATE_READY] = { 2070 [SCI_BASE_PORT_STATE_READY] = {
2099 .destruct_handler = scic_sds_port_default_destruct_handler,
2100 .reset_handler = scic_sds_port_default_reset_handler, 2071 .reset_handler = scic_sds_port_default_reset_handler,
2101 .add_phy_handler = scic_sds_port_default_add_phy_handler, 2072 .add_phy_handler = scic_sds_port_default_add_phy_handler,
2102 .remove_phy_handler = scic_sds_port_default_remove_phy_handler, 2073 .remove_phy_handler = scic_sds_port_default_remove_phy_handler,
@@ -2108,7 +2079,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
2108 .complete_io_handler = scic_sds_port_general_complete_io_handler 2079 .complete_io_handler = scic_sds_port_general_complete_io_handler
2109 }, 2080 },
2110 [SCIC_SDS_PORT_READY_SUBSTATE_WAITING] = { 2081 [SCIC_SDS_PORT_READY_SUBSTATE_WAITING] = {
2111 .destruct_handler = scic_sds_port_default_destruct_handler,
2112 .reset_handler = scic_sds_port_default_reset_handler, 2082 .reset_handler = scic_sds_port_default_reset_handler,
2113 .add_phy_handler = scic_sds_port_ready_substate_add_phy_handler, 2083 .add_phy_handler = scic_sds_port_ready_substate_add_phy_handler,
2114 .remove_phy_handler = scic_sds_port_default_remove_phy_handler, 2084 .remove_phy_handler = scic_sds_port_default_remove_phy_handler,
@@ -2120,7 +2090,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
2120 .complete_io_handler = scic_sds_port_ready_substate_complete_io_handler, 2090 .complete_io_handler = scic_sds_port_ready_substate_complete_io_handler,
2121 }, 2091 },
2122 [SCIC_SDS_PORT_READY_SUBSTATE_OPERATIONAL] = { 2092 [SCIC_SDS_PORT_READY_SUBSTATE_OPERATIONAL] = {
2123 .destruct_handler = scic_sds_port_default_destruct_handler,
2124 .reset_handler = scic_sds_port_ready_operational_substate_reset_handler, 2093 .reset_handler = scic_sds_port_ready_operational_substate_reset_handler,
2125 .add_phy_handler = scic_sds_port_ready_substate_add_phy_handler, 2094 .add_phy_handler = scic_sds_port_ready_substate_add_phy_handler,
2126 .remove_phy_handler = scic_sds_port_ready_substate_remove_phy_handler, 2095 .remove_phy_handler = scic_sds_port_ready_substate_remove_phy_handler,
@@ -2132,7 +2101,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
2132 .complete_io_handler = scic_sds_port_ready_substate_complete_io_handler, 2101 .complete_io_handler = scic_sds_port_ready_substate_complete_io_handler,
2133 }, 2102 },
2134 [SCIC_SDS_PORT_READY_SUBSTATE_CONFIGURING] = { 2103 [SCIC_SDS_PORT_READY_SUBSTATE_CONFIGURING] = {
2135 .destruct_handler = scic_sds_port_default_destruct_handler,
2136 .reset_handler = scic_sds_port_default_reset_handler, 2104 .reset_handler = scic_sds_port_default_reset_handler,
2137 .add_phy_handler = scic_sds_port_ready_configuring_substate_add_phy_handler, 2105 .add_phy_handler = scic_sds_port_ready_configuring_substate_add_phy_handler,
2138 .remove_phy_handler = scic_sds_port_ready_configuring_substate_remove_phy_handler, 2106 .remove_phy_handler = scic_sds_port_ready_configuring_substate_remove_phy_handler,
@@ -2144,7 +2112,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
2144 .complete_io_handler = scic_sds_port_ready_configuring_substate_complete_io_handler 2112 .complete_io_handler = scic_sds_port_ready_configuring_substate_complete_io_handler
2145 }, 2113 },
2146 [SCI_BASE_PORT_STATE_RESETTING] = { 2114 [SCI_BASE_PORT_STATE_RESETTING] = {
2147 .destruct_handler = scic_sds_port_default_destruct_handler,
2148 .reset_handler = scic_sds_port_default_reset_handler, 2115 .reset_handler = scic_sds_port_default_reset_handler,
2149 .add_phy_handler = scic_sds_port_default_add_phy_handler, 2116 .add_phy_handler = scic_sds_port_default_add_phy_handler,
2150 .remove_phy_handler = scic_sds_port_default_remove_phy_handler, 2117 .remove_phy_handler = scic_sds_port_default_remove_phy_handler,
@@ -2156,7 +2123,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
2156 .complete_io_handler = scic_sds_port_general_complete_io_handler 2123 .complete_io_handler = scic_sds_port_general_complete_io_handler
2157 }, 2124 },
2158 [SCI_BASE_PORT_STATE_FAILED] = { 2125 [SCI_BASE_PORT_STATE_FAILED] = {
2159 .destruct_handler = scic_sds_port_default_destruct_handler,
2160 .reset_handler = scic_sds_port_default_reset_handler, 2126 .reset_handler = scic_sds_port_default_reset_handler,
2161 .add_phy_handler = scic_sds_port_default_add_phy_handler, 2127 .add_phy_handler = scic_sds_port_default_add_phy_handler,
2162 .remove_phy_handler = scic_sds_port_default_remove_phy_handler, 2128 .remove_phy_handler = scic_sds_port_default_remove_phy_handler,