diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-05-12 15:51:41 +0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 15:04:48 +0400 |
| commit | 5b1d4af25186f5d23dae7a538d8472dacd9486c8 (patch) | |
| tree | 287de24a436c0efedf7d68cc8facbfa689344d4e /drivers/scsi/isci/phy.h | |
| parent | 23506a69e2ee761824c266f6e2cd541a7287c2a5 (diff) | |
| download | linux-5b1d4af25186f5d23dae7a538d8472dacd9486c8.tar.xz | |
isci: unify phy consume_power handlers
Unify the implementations in scic_sds_phy_consume_power_handler(), and kill
the state handler plus infrastructure.
Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/phy.h')
| -rw-r--r-- | drivers/scsi/isci/phy.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/drivers/scsi/isci/phy.h b/drivers/scsi/isci/phy.h index a95c74e58695..57708550a186 100644 --- a/drivers/scsi/isci/phy.h +++ b/drivers/scsi/isci/phy.h @@ -140,8 +140,6 @@ struct scic_sds_phy { */ void *sata_timeout_timer; - const struct scic_sds_phy_state_handler *state_handlers; - /** * This field is the pointer to the transport layer register for the SCU * hardware. @@ -504,20 +502,6 @@ enum scic_sds_phy_states { SCI_BASE_PHY_STATE_FINAL, }; - -typedef enum sci_status (*scic_sds_phy_handler_t)(struct scic_sds_phy *); -typedef enum sci_status (*scic_sds_phy_event_handler_t)(struct scic_sds_phy *, u32); -typedef enum sci_status (*scic_sds_phy_frame_handler_t)(struct scic_sds_phy *, u32); -typedef enum sci_status (*scic_sds_phy_power_handler_t)(struct scic_sds_phy *); - -struct scic_sds_phy_state_handler { - /** - * The state handler for staggered spinup. - */ - scic_sds_phy_power_handler_t consume_power_handler; - -}; - /** * scic_sds_phy_get_index() - * @@ -535,26 +519,6 @@ struct scic_sds_phy_state_handler { #define scic_sds_phy_get_controller(phy) \ (scic_sds_port_get_controller((phy)->owning_port)) -/** - * scic_sds_phy_set_state_handlers() - This macro sets the state handlers for - * this phy object - * - * - */ -#define scic_sds_phy_set_state_handlers(phy, handlers) \ - ((phy)->state_handlers = (handlers)) - -/** - * scic_sds_phy_set_base_state_handlers() - - * - * This macro set the base state handlers for the phy object. - */ -#define scic_sds_phy_set_base_state_handlers(phy, state_id) \ - scic_sds_phy_set_state_handlers(\ - (phy), \ - &scic_sds_phy_state_handler_table[(state_id)] \ - ) - void scic_sds_phy_construct( struct scic_sds_phy *this_phy, struct scic_sds_port *owning_port, |