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>

diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 675eddd3963e28e8b67c6a5c9afb4ed9524c5b61..2ef1c592a16f7fee8f79c7eef26e809613cdfe4b 100644 (file)
--- 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

diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c
index 9a5ec375f767909771805609d12c5e320ae3cb87..8bd1a85f621ef607bc81fd7dedec3e38b56e8485 100644 (file)
--- a/drivers/scsi/isci/phy.c
+++ b/drivers/scsi/isci/phy.c
@@ -287,7 +287,7 @@ static void scic_sds_phy_sata_timeout(void *phy)
  * port (i.e. it's contained in the dummy port). !NULL All other
  * values indicate a handle/pointer to the port containing the phy.
  */
-struct scic_sds_port *scic_sds_phy_get_port(
+struct scic_sds_port *phy_get_non_dummy_port(
        struct scic_sds_phy *sci_phy)
 {
        if (scic_sds_port_get_index(sci_phy->owning_port) == SCIC_SDS_DUMMY_PORT)
@@ -893,7 +893,7 @@ enum sci_status scic_sds_phy_event_handler(struct scic_sds_phy *sci_phy,
                        break;
                case SCU_EVENT_BROADCAST_CHANGE:
                        /* Broadcast change received. Notify the port. */
-                       if (scic_sds_phy_get_port(sci_phy) != NULL)
+                       if (phy_get_non_dummy_port(sci_phy) != NULL)
                                scic_sds_port_broadcast_change_received(sci_phy->owning_port, sci_phy);
                        else
                                sci_phy->bcn_received_while_port_unassigned = true;
@@ -1238,7 +1238,7 @@ static void scic_sds_phy_stopped_state_enter(void *object)
 
        if (sci_phy->state_machine.previous_state_id != SCI_BASE_PHY_STATE_INITIAL)
                scic_sds_controller_link_down(scic_sds_phy_get_controller(sci_phy),
-                                             scic_sds_phy_get_port(sci_phy),
+                                             phy_get_non_dummy_port(sci_phy),
                                              sci_phy);
 }
 
@@ -1255,7 +1255,7 @@ static void scic_sds_phy_starting_state_enter(void *object)
 
        if (sci_phy->state_machine.previous_state_id == SCI_BASE_PHY_STATE_READY)
                scic_sds_controller_link_down(scic_sds_phy_get_controller(sci_phy),
-                                             scic_sds_phy_get_port(sci_phy),
+                                             phy_get_non_dummy_port(sci_phy),
                                              sci_phy);
 
        sci_base_state_machine_change_state(&sci_phy->state_machine,
@@ -1267,7 +1267,7 @@ static void scic_sds_phy_ready_state_enter(void *object)
        struct scic_sds_phy *sci_phy = object;
 
        scic_sds_controller_link_up(scic_sds_phy_get_controller(sci_phy),
-                                   scic_sds_phy_get_port(sci_phy),
+                                   phy_get_non_dummy_port(sci_phy),
                                    sci_phy);
 
 }

diff --git a/drivers/scsi/isci/phy.h b/drivers/scsi/isci/phy.h
index 57708550a1860937631059e61255443590dcbcd1..7694ec4d76b522490f188055d9c291d49b130cfb 100644 (file)
--- a/drivers/scsi/isci/phy.h
+++ b/drivers/scsi/isci/phy.h
@@ -524,8 +524,7 @@ void scic_sds_phy_construct(
        struct scic_sds_port *owning_port,
        u8 phy_index);
 
-struct scic_sds_port *scic_sds_phy_get_port(
-       struct scic_sds_phy *this_phy);
+struct scic_sds_port *phy_get_non_dummy_port(struct scic_sds_phy *sci_phy);
 
 void scic_sds_phy_set_port(
        struct scic_sds_phy *this_phy,

diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c
index dbff28396dd860daeeca71cea22fcf572a840ec9..6d2633051adcfc299fb2eaf31b93f38f0358514d 100644 (file)
--- 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);
 

diff --git a/drivers/scsi/isci/port_config.c b/drivers/scsi/isci/port_config.c
index 028ffa370c90e537e4abdc0be214e3551f39fb10..ca76f493c30d3f715e32a7efcec0ab45b20ffd3b 100644 (file)
--- a/drivers/scsi/isci/port_config.c
+++ b/drivers/scsi/isci/port_config.c
@@ -353,7 +353,7 @@ static void scic_sds_mpc_agent_timeout_handler(void *object)
 
                if (configure_phy_mask & (1 << index)) {
                        port_agent->link_up_handler(scic, port_agent,
-                                                   scic_sds_phy_get_port(sci_phy),
+                                                   phy_get_non_dummy_port(sci_phy),
                                                    sci_phy);
                }
        }