summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/port.h
diff options
context:
space:
mode:
authorPiotr Sawicki <piotr.sawicki@intel.com>2011-05-12 19:10:14 +0000
committerDan Williams <dan.j.williams@intel.com>2011-07-03 04:04:49 -0700
commit051266caaeb15719553c5316e3d43b533d3cd5a0 (patch)
treec3db604dbdf2da01ed27d80921cd302b364fcb3e /drivers/scsi/isci/port.h
parent13721e186fd31cd8475e635a89383853871fdbf1 (diff)
downloadlinux-051266caaeb15719553c5316e3d43b533d3cd5a0.tar.bz2
isci: unify port link_up and link_down handlers
Unify the handlers and kill the state handler implementations. Reported-by: Christoph Hellwig <hch@lst.de> 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.h')
-rw-r--r--drivers/scsi/isci/port.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/scsi/isci/port.h b/drivers/scsi/isci/port.h
index 20f99263fa0a..bbce0ec583a9 100644
--- a/drivers/scsi/isci/port.h
+++ b/drivers/scsi/isci/port.h
@@ -312,9 +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 {
- scic_sds_port_link_handler_t link_up_handler;
- scic_sds_port_link_handler_t link_down_handler;
-
scic_sds_port_io_request_handler_t start_io_handler;
scic_sds_port_io_request_handler_t complete_io_handler;
};
@@ -402,13 +399,10 @@ bool scic_sds_port_link_detected(
struct scic_sds_port *sci_port,
struct scic_sds_phy *sci_phy);
-void scic_sds_port_link_up(
- struct scic_sds_port *sci_port,
- struct scic_sds_phy *sci_phy);
-
-void scic_sds_port_link_down(
- struct scic_sds_port *sci_port,
- struct scic_sds_phy *sci_phy);
+enum sci_status scic_sds_port_link_up(struct scic_sds_port *sci_port,
+ struct scic_sds_phy *sci_phy);
+enum sci_status scic_sds_port_link_down(struct scic_sds_port *sci_port,
+ struct scic_sds_phy *sci_phy);
enum sci_status scic_sds_port_start_io(
struct scic_sds_port *sci_port,