summaryrefslogtreecommitdiff
path: root/drivers/scsi/isci/port.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-05-12 17:00:31 +0400
committerDan Williams <dan.j.williams@intel.com>2011-07-03 15:04:48 +0400
commit4f20ef4f57aa52fd3356c143a8f3d2bd18dc61fc (patch)
tree27c2c01305cad71eb6ebaf96e67ad3ce8d834c30 /drivers/scsi/isci/port.c
parent5b1d4af25186f5d23dae7a538d8472dacd9486c8 (diff)
downloadlinux-4f20ef4f57aa52fd3356c143a8f3d2bd18dc61fc.tar.xz
isci: clarify phy to port lookups
While cleaning up the driver it is very tempting to convert scic_sds_get_* macros to their open coded equivalent. They are all just pointer dereferences *except* scic_sds_phy_get_port() which returns NULL if the phy is assigned to the dummy port. Clarify this by renaming it to phy_get_non_dummy_port(). Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/port.c')
-rw-r--r--drivers/scsi/isci/port.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c
index dbff28396dd8..6d2633051adc 100644
--- a/drivers/scsi/isci/port.c
+++ b/drivers/scsi/isci/port.c
@@ -485,7 +485,7 @@ static enum sci_status scic_sds_port_set_phy(
* not already have a phy assinged to the phy index. */
if (
(port->phy_table[phy->phy_index] == NULL)
- && (scic_sds_phy_get_port(phy) == NULL)
+ && (phy_get_non_dummy_port(phy) == NULL)
&& scic_sds_port_is_valid_phy_assignment(port, phy->phy_index)
) {
/*
@@ -516,7 +516,7 @@ static enum sci_status scic_sds_port_clear_phy(
{
/* Make sure that this phy is part of this port */
if (port->phy_table[phy->phy_index] == phy &&
- scic_sds_phy_get_port(phy) == port) {
+ phy_get_non_dummy_port(phy) == port) {
struct scic_sds_controller *scic = port->owning_controller;
struct isci_host *ihost = scic_to_ihost(scic);