isci: unify isci_port and scic_sds_port

Remove the distinction between these two implementations and unify on
isci_port (local instances named iport).  The duplicate '->owning_port' and
'->isci_port' in both isci_phy and isci_remote_device will be fixed in a later
patch... this is just the straightforward rename/unification.

Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h
index 1edd13535c24..fb8048e5fce7 100644
--- a/drivers/scsi/isci/host.h
+++ b/drivers/scsi/isci/host.h
@@ -108,7 +108,7 @@ struct scic_power_control {
 struct scic_sds_port_configuration_agent;
 typedef void (*port_config_fn)(struct scic_sds_controller *,
                                struct scic_sds_port_configuration_agent *,
-                               struct scic_sds_port *, struct isci_phy *);
+                               struct isci_port *, struct isci_phy *);
 
 struct scic_sds_port_configuration_agent {
         u16 phy_configured_mask;
@@ -532,9 +532,8 @@ static inline struct device *sciphy_to_dev(struct isci_phy *iphy)
         return &iphy->isci_port->isci_host->pdev->dev;
 }
 
-static inline struct device *sciport_to_dev(struct scic_sds_port *sci_port)
+static inline struct device *sciport_to_dev(struct isci_port *iport)
 {
-        struct isci_port *iport = sci_port_to_iport(sci_port);
 
         if (!iport || !iport->isci_host)
                 return NULL;
@@ -613,12 +612,12 @@ void scic_sds_controller_power_control_queue_remove(
 
 void scic_sds_controller_link_up(
         struct scic_sds_controller *scic,
-        struct scic_sds_port *sci_port,
+        struct isci_port *iport,
         struct isci_phy *iphy);
 
 void scic_sds_controller_link_down(
         struct scic_sds_controller *scic,
-        struct scic_sds_port *sci_port,
+        struct isci_port *iport,
         struct isci_phy *iphy);
 
 void scic_sds_controller_remote_device_stopped(
@@ -649,7 +648,7 @@ void isci_host_deinit(
 
 void isci_host_port_link_up(
         struct isci_host *,
-        struct scic_sds_port *,
+        struct isci_port *,
         struct isci_phy *);
 int isci_host_dev_found(struct domain_device *);