Skip to content

Commit

Permalink
isci: remove port destruct handler
Browse files Browse the repository at this point in the history 
The handler was never used.

Signed-off-by: Piotr Sawicki <piotr.sawicki@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
@piotr-intel @djbw
piotr-intel authored and djbw committed Jul 3, 2011
1 parent 8bc80d3 commit e6ec5af
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 40 deletions.
34 changes: 0 additions & 34 deletions drivers/scsi/isci/port.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -885,13 +885,6 @@ static void port_state_machine_change(struct scic_sds_port *sci_port,
sci_port->ready_exit = false;
}

static void port_state_machine_stop(struct scic_sds_port *sci_port)
{
sci_port->ready_exit = true;
sci_base_state_machine_stop(&sci_port->state_machine);
sci_port->ready_exit = false;
}

/**
* scic_sds_port_general_link_up_handler - phy can be assigned to port?
* @sci_port: scic_sds_port object for which has a phy that has gone link up.
Expand Down Expand Up @@ -1468,12 +1461,6 @@ static enum sci_status default_port_handler(struct scic_sds_port *sci_port,
return SCI_FAILURE_INVALID_STATE;
}

static enum sci_status
scic_sds_port_default_destruct_handler(struct scic_sds_port *sci_port)
{
return default_port_handler(sci_port, __func__);
}

static enum sci_status
scic_sds_port_default_reset_handler(struct scic_sds_port *sci_port,
u32 timeout)
Expand Down Expand Up @@ -1830,19 +1817,6 @@ static enum sci_status scic_sds_port_general_complete_io_handler(
return SCI_SUCCESS;
}

/*
* This method takes the struct scic_sds_port that is in a stopped state and handles
* the destruct request. The stopped state is the only state in which the
* struct scic_sds_port can be destroyed. This function causes the port object to
* transition to the SCI_BASE_PORT_STATE_FINAL. enum sci_status SCI_SUCCESS
*/
static enum sci_status scic_sds_port_stopped_state_destruct_handler(struct scic_sds_port *port)
{
port_state_machine_stop(port);

return SCI_SUCCESS;
}

/*
* This method takes the struct scic_sds_port that is in a stopped state and handles
* the add phy request. In MPC mode the only time a phy can be added to a port
Expand Down Expand Up @@ -2072,7 +2046,6 @@ enum sci_status scic_sds_port_stop(struct scic_sds_port *sci_port)

static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] = {
[SCI_BASE_PORT_STATE_STOPPED] = {
.destruct_handler = scic_sds_port_stopped_state_destruct_handler,
.reset_handler = scic_sds_port_default_reset_handler,
.add_phy_handler = scic_sds_port_stopped_state_add_phy_handler,
.remove_phy_handler = scic_sds_port_stopped_state_remove_phy_handler,
Expand All @@ -2084,7 +2057,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
.complete_io_handler = scic_sds_port_default_complete_io_handler
},
[SCI_BASE_PORT_STATE_STOPPING] = {
.destruct_handler = scic_sds_port_default_destruct_handler,
.reset_handler = scic_sds_port_default_reset_handler,
.add_phy_handler = scic_sds_port_default_add_phy_handler,
.remove_phy_handler = scic_sds_port_default_remove_phy_handler,
Expand All @@ -2096,7 +2068,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
.complete_io_handler = scic_sds_port_stopping_state_complete_io_handler
},
[SCI_BASE_PORT_STATE_READY] = {
.destruct_handler = scic_sds_port_default_destruct_handler,
.reset_handler = scic_sds_port_default_reset_handler,
.add_phy_handler = scic_sds_port_default_add_phy_handler,
.remove_phy_handler = scic_sds_port_default_remove_phy_handler,
Expand All @@ -2108,7 +2079,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
.complete_io_handler = scic_sds_port_general_complete_io_handler
},
[SCIC_SDS_PORT_READY_SUBSTATE_WAITING] = {
.destruct_handler = scic_sds_port_default_destruct_handler,
.reset_handler = scic_sds_port_default_reset_handler,
.add_phy_handler = scic_sds_port_ready_substate_add_phy_handler,
.remove_phy_handler = scic_sds_port_default_remove_phy_handler,
Expand All @@ -2120,7 +2090,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
.complete_io_handler = scic_sds_port_ready_substate_complete_io_handler,
},
[SCIC_SDS_PORT_READY_SUBSTATE_OPERATIONAL] = {
.destruct_handler = scic_sds_port_default_destruct_handler,
.reset_handler = scic_sds_port_ready_operational_substate_reset_handler,
.add_phy_handler = scic_sds_port_ready_substate_add_phy_handler,
.remove_phy_handler = scic_sds_port_ready_substate_remove_phy_handler,
Expand All @@ -2132,7 +2101,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
.complete_io_handler = scic_sds_port_ready_substate_complete_io_handler,
},
[SCIC_SDS_PORT_READY_SUBSTATE_CONFIGURING] = {
.destruct_handler = scic_sds_port_default_destruct_handler,
.reset_handler = scic_sds_port_default_reset_handler,
.add_phy_handler = scic_sds_port_ready_configuring_substate_add_phy_handler,
.remove_phy_handler = scic_sds_port_ready_configuring_substate_remove_phy_handler,
Expand All @@ -2144,7 +2112,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
.complete_io_handler = scic_sds_port_ready_configuring_substate_complete_io_handler
},
[SCI_BASE_PORT_STATE_RESETTING] = {
.destruct_handler = scic_sds_port_default_destruct_handler,
.reset_handler = scic_sds_port_default_reset_handler,
.add_phy_handler = scic_sds_port_default_add_phy_handler,
.remove_phy_handler = scic_sds_port_default_remove_phy_handler,
Expand All @@ -2156,7 +2123,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] =
.complete_io_handler = scic_sds_port_general_complete_io_handler
},
[SCI_BASE_PORT_STATE_FAILED] = {
.destruct_handler = scic_sds_port_default_destruct_handler,
.reset_handler = scic_sds_port_default_reset_handler,
.add_phy_handler = scic_sds_port_default_add_phy_handler,
.remove_phy_handler = scic_sds_port_default_remove_phy_handler,
Expand Down
6 changes: 0 additions & 6 deletions drivers/scsi/isci/port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,12 +312,6 @@ typedef enum sci_status (*scic_sds_port_io_request_handler_t)(struct scic_sds_po
struct scic_sds_request *);

struct scic_sds_port_state_handler {
/**
* The destruct_handler specifies the method invoked when attempting to
* destruct a port.
*/
scic_sds_port_handler_t destruct_handler;

/**
* The reset_handler specifies the method invoked when a user
* attempts to hard reset a port.
Expand Down

0 comments on commit e6ec5af

Please sign in to comment.