diff options
| author | Dan Williams | 2011-05-12 15:00:31 +0200 |
|---|---|---|
| committer | Dan Williams | 2011-07-03 13:04:48 +0200 |
| commit | 4f20ef4f57aa52fd3356c143a8f3d2bd18dc61fc (patch) | |
| tree | 27c2c01305cad71eb6ebaf96e67ad3ce8d834c30 /drivers/scsi/isci/host.c | |
| parent | isci: unify phy consume_power handlers (diff) | |
| download | kernel-qcow2-linux-4f20ef4f57aa52fd3356c143a8f3d2bd18dc61fc.tar.gz kernel-qcow2-linux-4f20ef4f57aa52fd3356c143a8f3d2bd18dc61fc.tar.xz kernel-qcow2-linux-4f20ef4f57aa52fd3356c143a8f3d2bd18dc61fc.zip | |
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.c | 4 |
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 sci_phy = &ihost->phys[index].sci; state = sci_phy->state_machine.current_state_id; - if (!scic_sds_phy_get_port(sci_phy)) + if (!phy_get_non_dummy_port(sci_phy)) continue; /* 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 sci_phy = &ihost->phys[scic->next_phy_to_start].sci; if (oem->controller.mode_type == SCIC_PORT_MANUAL_CONFIGURATION_MODE) { - if (scic_sds_phy_get_port(sci_phy) == NULL) { + if (phy_get_non_dummy_port(sci_phy) == NULL) { scic->next_phy_to_start++; /* Caution recursion ahead be forwarned |