summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/remote_device.h
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-06-29 22:09:25 +0200
committerDan Williams <dan.j.williams@intel.com>2011-07-03 13:04:52 +0200
commitffe191c92ff195d73f9130b1490045ca2dd4c5e0 (patch)
treec14a78903734b7f5e662e7cf49db4d7fd24e4d71 /drivers/scsi/isci/remote_device.h
parentisci: fix scic_sds_remote_device_terminate_requests (diff)
downloadlinux-ffe191c92ff195d73f9130b1490045ca2dd4c5e0.tar.xz
linux-ffe191c92ff195d73f9130b1490045ca2dd4c5e0.zip
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>
Diffstat (limited to 'drivers/scsi/isci/remote_device.h')
-rw-r--r--drivers/scsi/isci/remote_device.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/scsi/isci/remote_device.h b/drivers/scsi/isci/remote_device.h
index 6ac5dfb7d1db..578d75b8cd16 100644
--- a/drivers/scsi/isci/remote_device.h
+++ b/drivers/scsi/isci/remote_device.h
@@ -100,7 +100,7 @@ struct scic_sds_remote_device {
* This filed contains a pointer back to the port to which this device
* is assigned.
*/
- struct scic_sds_port *owning_port;
+ struct isci_port *owning_port;
/**
* This field contains the SCU silicon remote node context specific
@@ -388,14 +388,6 @@ static inline bool dev_is_expander(struct domain_device *dev)
((sci_dev)->started_request_count)
/**
- * scic_sds_remote_device_get_port() -
- *
- * This macro returns the owning port of this remote device obejct.
- */
-#define scic_sds_remote_device_get_port(sci_dev) \
- ((sci_dev)->owning_port)
-
-/**
* scic_sds_remote_device_get_controller() -
*
* This macro returns the controller object that contains this device object