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>
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 @@
/**
* 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_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 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 @@
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,
