diff options
Diffstat (limited to 'drivers/scsi/isci/phy.c')
-rw-r--r-- | drivers/scsi/isci/phy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c index 9a5ec375f767..8bd1a85f621e 100644 --- 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) | |||
287 | * port (i.e. it's contained in the dummy port). !NULL All other | 287 | * port (i.e. it's contained in the dummy port). !NULL All other |
288 | * values indicate a handle/pointer to the port containing the phy. | 288 | * values indicate a handle/pointer to the port containing the phy. |
289 | */ | 289 | */ |
290 | struct scic_sds_port *scic_sds_phy_get_port( | 290 | struct scic_sds_port *phy_get_non_dummy_port( |
291 | struct scic_sds_phy *sci_phy) | 291 | struct scic_sds_phy *sci_phy) |
292 | { | 292 | { |
293 | if (scic_sds_port_get_index(sci_phy->owning_port) == SCIC_SDS_DUMMY_PORT) | 293 | 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, | |||
893 | break; | 893 | break; |
894 | case SCU_EVENT_BROADCAST_CHANGE: | 894 | case SCU_EVENT_BROADCAST_CHANGE: |
895 | /* Broadcast change received. Notify the port. */ | 895 | /* Broadcast change received. Notify the port. */ |
896 | if (scic_sds_phy_get_port(sci_phy) != NULL) | 896 | if (phy_get_non_dummy_port(sci_phy) != NULL) |
897 | scic_sds_port_broadcast_change_received(sci_phy->owning_port, sci_phy); | 897 | scic_sds_port_broadcast_change_received(sci_phy->owning_port, sci_phy); |
898 | else | 898 | else |
899 | sci_phy->bcn_received_while_port_unassigned = true; | 899 | sci_phy->bcn_received_while_port_unassigned = true; |
@@ -1238,7 +1238,7 @@ static void scic_sds_phy_stopped_state_enter(void *object) | |||
1238 | 1238 | ||
1239 | if (sci_phy->state_machine.previous_state_id != SCI_BASE_PHY_STATE_INITIAL) | 1239 | if (sci_phy->state_machine.previous_state_id != SCI_BASE_PHY_STATE_INITIAL) |
1240 | scic_sds_controller_link_down(scic_sds_phy_get_controller(sci_phy), | 1240 | scic_sds_controller_link_down(scic_sds_phy_get_controller(sci_phy), |
1241 | scic_sds_phy_get_port(sci_phy), | 1241 | phy_get_non_dummy_port(sci_phy), |
1242 | sci_phy); | 1242 | sci_phy); |
1243 | } | 1243 | } |
1244 | 1244 | ||
@@ -1255,7 +1255,7 @@ static void scic_sds_phy_starting_state_enter(void *object) | |||
1255 | 1255 | ||
1256 | if (sci_phy->state_machine.previous_state_id == SCI_BASE_PHY_STATE_READY) | 1256 | if (sci_phy->state_machine.previous_state_id == SCI_BASE_PHY_STATE_READY) |
1257 | scic_sds_controller_link_down(scic_sds_phy_get_controller(sci_phy), | 1257 | scic_sds_controller_link_down(scic_sds_phy_get_controller(sci_phy), |
1258 | scic_sds_phy_get_port(sci_phy), | 1258 | phy_get_non_dummy_port(sci_phy), |
1259 | sci_phy); | 1259 | sci_phy); |
1260 | 1260 | ||
1261 | sci_base_state_machine_change_state(&sci_phy->state_machine, | 1261 | sci_base_state_machine_change_state(&sci_phy->state_machine, |
@@ -1267,7 +1267,7 @@ static void scic_sds_phy_ready_state_enter(void *object) | |||
1267 | struct scic_sds_phy *sci_phy = object; | 1267 | struct scic_sds_phy *sci_phy = object; |
1268 | 1268 | ||
1269 | scic_sds_controller_link_up(scic_sds_phy_get_controller(sci_phy), | 1269 | scic_sds_controller_link_up(scic_sds_phy_get_controller(sci_phy), |
1270 | scic_sds_phy_get_port(sci_phy), | 1270 | phy_get_non_dummy_port(sci_phy), |
1271 | sci_phy); | 1271 | sci_phy); |
1272 | 1272 | ||
1273 | } | 1273 | } |