aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci/host.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-05-12 09:00:31 -0400
committerDan Williams <dan.j.williams@intel.com>2011-07-03 07:04:48 -0400
commit4f20ef4f57aa52fd3356c143a8f3d2bd18dc61fc (patch)
tree27c2c01305cad71eb6ebaf96e67ad3ce8d834c30 /drivers/scsi/isci/host.c
parent5b1d4af25186f5d23dae7a538d8472dacd9486c8 (diff)
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/host.c')
-rw-r--r--drivers/scsi/isci/host.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 675eddd3963e..2ef1c592a16f 100644
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -983,7 +983,7 @@ static enum sci_status scic_sds_controller_start_next_phy(struct scic_sds_contro
983 sci_phy = &ihost->phys[index].sci; 983 sci_phy = &ihost->phys[index].sci;
984 state = sci_phy->state_machine.current_state_id; 984 state = sci_phy->state_machine.current_state_id;
985 985
986 if (!scic_sds_phy_get_port(sci_phy)) 986 if (!phy_get_non_dummy_port(sci_phy))
987 continue; 987 continue;
988 988
989 /* The controller start operation is complete iff: 989 /* The controller start operation is complete iff:
@@ -1014,7 +1014,7 @@ static enum sci_status scic_sds_controller_start_next_phy(struct scic_sds_contro
1014 sci_phy = &ihost->phys[scic->next_phy_to_start].sci; 1014 sci_phy = &ihost->phys[scic->next_phy_to_start].sci;
1015 1015
1016 if (oem->controller.mode_type == SCIC_PORT_MANUAL_CONFIGURATION_MODE) { 1016 if (oem->controller.mode_type == SCIC_PORT_MANUAL_CONFIGURATION_MODE) {
1017 if (scic_sds_phy_get_port(sci_phy) == NULL) { 1017 if (phy_get_non_dummy_port(sci_phy) == NULL) {
1018 scic->next_phy_to_start++; 1018 scic->next_phy_to_start++;
1019 1019
1020 /* Caution recursion ahead be forwarned 1020 /* Caution recursion ahead be forwarned