summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/port.h
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-06-28 15:05:53 -0700
committerDan Williams <dan.j.williams@intel.com>2011-07-03 04:04:52 -0700
commit852809559e4680ba4768262a6c3d21454fcd460e (patch)
treea67170a9dd2a4c9f15d215f4b96e890cdb53a7e7 /drivers/scsi/isci/port.h
parent5076a1a97e2fa61c847a5fdd4b1991faf7716da6 (diff)
downloadop-kernel-dev-852809559e4680ba4768262a6c3d21454fcd460e.zip
op-kernel-dev-852809559e4680ba4768262a6c3d21454fcd460e.tar.gz
isci: unify isci_phy and scic_sds_phy
They are one in the same object so remove the distinction. The near duplicate fields (owning_port, and isci_port) will be cleaned up after the scic_sds_port isci_port unification. Reported-by: Christoph Hellwig <hch@lst.de> 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.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/scsi/isci/port.h b/drivers/scsi/isci/port.h
index 668f3a1..b6ce56a 100644
--- a/drivers/scsi/isci/port.h
+++ b/drivers/scsi/isci/port.h
@@ -131,7 +131,7 @@ struct scic_sds_port {
/**
* This field is the table of phys assigned to the port.
*/
- struct scic_sds_phy *phy_table[SCI_MAX_PHYS];
+ struct isci_phy *phy_table[SCI_MAX_PHYS];
/**
* This field is a pointer back to the controller that owns this
@@ -328,11 +328,11 @@ enum sci_status scic_sds_port_stop(struct scic_sds_port *sci_port);
enum sci_status scic_sds_port_add_phy(
struct scic_sds_port *sci_port,
- struct scic_sds_phy *sci_phy);
+ struct isci_phy *iphy);
enum sci_status scic_sds_port_remove_phy(
struct scic_sds_port *sci_port,
- struct scic_sds_phy *sci_phy);
+ struct isci_phy *iphy);
void scic_sds_port_setup_transports(
struct scic_sds_port *sci_port,
@@ -342,17 +342,17 @@ void isci_port_bcn_enable(struct isci_host *, struct isci_port *);
void scic_sds_port_deactivate_phy(
struct scic_sds_port *sci_port,
- struct scic_sds_phy *sci_phy,
+ struct isci_phy *iphy,
bool do_notify_user);
bool scic_sds_port_link_detected(
struct scic_sds_port *sci_port,
- struct scic_sds_phy *sci_phy);
+ struct isci_phy *iphy);
enum sci_status scic_sds_port_link_up(struct scic_sds_port *sci_port,
- struct scic_sds_phy *sci_phy);
+ struct isci_phy *iphy);
enum sci_status scic_sds_port_link_down(struct scic_sds_port *sci_port,
- struct scic_sds_phy *sci_phy);
+ struct isci_phy *iphy);
struct isci_request;
struct scic_sds_remote_device;
@@ -371,7 +371,7 @@ enum sas_linkrate scic_sds_port_get_max_allowed_speed(
void scic_sds_port_broadcast_change_received(
struct scic_sds_port *sci_port,
- struct scic_sds_phy *sci_phy);
+ struct isci_phy *iphy);
bool scic_sds_port_is_valid_phy_assignment(
struct scic_sds_port *sci_port,
OpenPOWER on IntegriCloud