]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
isci: remove phy destruct handlers
authorDan Williams <dan.j.williams@intel.com>
Thu, 12 May 2011 11:10:41 +0000 (04:10 -0700)
committerDan Williams <dan.j.williams@intel.com>
Sun, 3 Jul 2011 11:04:48 +0000 (04:04 -0700)
Unused infrastructure.

Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
drivers/scsi/isci/phy.c
drivers/scsi/isci/phy.h

index b606e2f317d50624836c370178089fa23c09ecb5..8beea40697da6a1ef2e547bb99086a94e7c108f9 100644 (file)
@@ -1267,12 +1267,6 @@ static enum sci_status default_phy_handler(struct scic_sds_phy *sci_phy,
        return SCI_FAILURE_INVALID_STATE;
 }
 
-static enum sci_status
-scic_sds_phy_default_destroy_handler(struct scic_sds_phy *sci_phy)
-{
-       return default_phy_handler(sci_phy, __func__);
-}
-
 static enum sci_status
 scic_sds_phy_default_frame_handler(struct scic_sds_phy *sci_phy,
                                   u32 frame_index)
@@ -1298,12 +1292,6 @@ scic_sds_phy_default_consume_power_handler(struct scic_sds_phy *sci_phy)
        return default_phy_handler(sci_phy, __func__);
 }
 
-static enum sci_status
-scic_sds_phy_stopped_state_destroy_handler(struct scic_sds_phy *sci_phy)
-{
-       return SCI_SUCCESS;
-}
-
 /**
  * scic_sds_phy_ready_state_event_handler -
  * @phy: This is the struct scic_sds_phy object which has received the event.
@@ -1379,97 +1367,81 @@ static enum sci_status scic_sds_phy_resetting_state_event_handler(struct scic_sd
 
 static const struct scic_sds_phy_state_handler scic_sds_phy_state_handler_table[] = {
        [SCI_BASE_PHY_STATE_INITIAL] = {
-               .destruct_handler = scic_sds_phy_default_destroy_handler,
                .frame_handler           = scic_sds_phy_default_frame_handler,
                .event_handler           = scic_sds_phy_default_event_handler,
                .consume_power_handler   = scic_sds_phy_default_consume_power_handler
        },
        [SCI_BASE_PHY_STATE_STOPPED]  = {
-               .destruct_handler = scic_sds_phy_stopped_state_destroy_handler,
                .frame_handler           = scic_sds_phy_default_frame_handler,
                .event_handler           = scic_sds_phy_default_event_handler,
                .consume_power_handler   = scic_sds_phy_default_consume_power_handler
        },
        [SCI_BASE_PHY_STATE_STARTING] = {
-               .destruct_handler = scic_sds_phy_default_destroy_handler,
                .frame_handler           = scic_sds_phy_default_frame_handler,
                .event_handler           = scic_sds_phy_default_event_handler,
                .consume_power_handler   = scic_sds_phy_default_consume_power_handler
        },
        [SCIC_SDS_PHY_STARTING_SUBSTATE_INITIAL] = {
-               .destruct_handler       = scic_sds_phy_default_destroy_handler,
                .frame_handler          = scic_sds_phy_default_frame_handler,
                .event_handler          = scic_sds_phy_default_event_handler,
                .consume_power_handler  = scic_sds_phy_default_consume_power_handler
        },
        [SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_OSSP_EN] = {
-               .destruct_handler       = scic_sds_phy_default_destroy_handler,
                .frame_handler          = scic_sds_phy_default_frame_handler,
                .event_handler          = scic_sds_phy_starting_substate_await_ossp_event_handler,
                .consume_power_handler  = scic_sds_phy_default_consume_power_handler
        },
        [SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SAS_SPEED_EN] = {
-               .destruct_handler       = scic_sds_phy_default_destroy_handler,
                .frame_handler          = scic_sds_phy_default_frame_handler,
                .event_handler          = scic_sds_phy_starting_substate_await_sas_phy_speed_event_handler,
                .consume_power_handler  = scic_sds_phy_default_consume_power_handler
        },
        [SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_IAF_UF] = {
-               .destruct_handler       = scic_sds_phy_default_destroy_handler,
                .frame_handler          = scic_sds_phy_starting_substate_await_iaf_uf_frame_handler,
                .event_handler          = scic_sds_phy_starting_substate_await_iaf_uf_event_handler,
                .consume_power_handler  = scic_sds_phy_default_consume_power_handler
        },
        [SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SAS_POWER] = {
-               .destruct_handler       = scic_sds_phy_default_destroy_handler,
                .frame_handler          = scic_sds_phy_default_frame_handler,
                .event_handler          = scic_sds_phy_starting_substate_await_sas_power_event_handler,
                .consume_power_handler  = scic_sds_phy_starting_substate_await_sas_power_consume_power_handler
        },
        [SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SATA_POWER] = {
-               .destruct_handler       = scic_sds_phy_default_destroy_handler,
                .frame_handler          = scic_sds_phy_default_frame_handler,
                .event_handler          = scic_sds_phy_starting_substate_await_sata_power_event_handler,
                .consume_power_handler  = scic_sds_phy_starting_substate_await_sata_power_consume_power_handler
        },
        [SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SATA_PHY_EN] = {
-               .destruct_handler       = scic_sds_phy_default_destroy_handler,
                .frame_handler          = scic_sds_phy_default_frame_handler,
                .event_handler          = scic_sds_phy_starting_substate_await_sata_phy_event_handler,
                .consume_power_handler  = scic_sds_phy_default_consume_power_handler
        },
        [SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SATA_SPEED_EN] = {
-               .destruct_handler       = scic_sds_phy_default_destroy_handler,
                .frame_handler          = scic_sds_phy_default_frame_handler,
                .event_handler          = scic_sds_phy_starting_substate_await_sata_speed_event_handler,
                .consume_power_handler  = scic_sds_phy_default_consume_power_handler
        },
        [SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SIG_FIS_UF] = {
-               .destruct_handler       = scic_sds_phy_default_destroy_handler,
                .frame_handler          = scic_sds_phy_starting_substate_await_sig_fis_frame_handler,
                .event_handler          = scic_sds_phy_starting_substate_await_sig_fis_event_handler,
                .consume_power_handler  = scic_sds_phy_default_consume_power_handler
        },
        [SCIC_SDS_PHY_STARTING_SUBSTATE_FINAL] = {
-               .destruct_handler       = scic_sds_phy_default_destroy_handler,
                .frame_handler           = scic_sds_phy_default_frame_handler,
                .event_handler           = scic_sds_phy_default_event_handler,
                .consume_power_handler   = scic_sds_phy_default_consume_power_handler
        },
        [SCI_BASE_PHY_STATE_READY] = {
-               .destruct_handler = scic_sds_phy_default_destroy_handler,
                .frame_handler           = scic_sds_phy_default_frame_handler,
                .event_handler           = scic_sds_phy_ready_state_event_handler,
                .consume_power_handler   = scic_sds_phy_default_consume_power_handler
        },
        [SCI_BASE_PHY_STATE_RESETTING] = {
-               .destruct_handler = scic_sds_phy_default_destroy_handler,
                .frame_handler           = scic_sds_phy_default_frame_handler,
                .event_handler           = scic_sds_phy_resetting_state_event_handler,
                .consume_power_handler   = scic_sds_phy_default_consume_power_handler
        },
        [SCI_BASE_PHY_STATE_FINAL] = {
-               .destruct_handler = scic_sds_phy_default_destroy_handler,
                .frame_handler           = scic_sds_phy_default_frame_handler,
                .event_handler           = scic_sds_phy_default_event_handler,
                .consume_power_handler   = scic_sds_phy_default_consume_power_handler
index 56474333dfca74a58d6b6ac3c28fcc7997b2ebeb..24536d6eef81b27b72c933c9a9b2e9543343d80f 100644 (file)
@@ -511,12 +511,6 @@ typedef enum sci_status (*scic_sds_phy_frame_handler_t)(struct scic_sds_phy *, u
 typedef enum sci_status (*scic_sds_phy_power_handler_t)(struct scic_sds_phy *);
 
 struct scic_sds_phy_state_handler {
-       /**
-        * The destruct_handler specifies the method invoked when attempting to
-        * destruct a phy.
-        */
-       scic_sds_phy_handler_t destruct_handler;
-
        /**
         * The state handler for unsolicited frames received from the SCU hardware.
         */