---

yaml --- r: 254408 b: refs/heads/master c: 0ea99d5 h: refs/heads/master v: v3
git-mirror · Jul 3, 2011 · e3acc67 · e3acc67
1 parent 166fefe
commit e3acc67
Show file tree

Hide file tree

Showing 7 changed files with 573 additions and 742 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c629582d0dea42d8b3617f8c46ea2770b95e23aa
+refs/heads/master: 0ea99d52cbcdb4bf5f5dd3097088a2919a115981
diff --git a/trunk/drivers/scsi/isci/core/sci_base_remote_device.h b/trunk/drivers/scsi/isci/core/sci_base_remote_device.h
diff --git a/trunk/drivers/scsi/isci/core/scic_sds_controller.c b/trunk/drivers/scsi/isci/core/scic_sds_controller.c
@@ -1500,13 +1500,13 @@ void scic_sds_controller_link_down(struct scic_sds_controller *scic,
  *
  */
 static bool scic_sds_controller_has_remote_devices_stopping(
-	struct scic_sds_controller *this_controller)
+	struct scic_sds_controller *controller)
 {
 	u32 index;
 
-	for (index = 0; index < this_controller->remote_node_entries; index++) {
-		if ((this_controller->device_table[index] != NULL) &&
-		   (this_controller->device_table[index]->parent.state_machine.current_state_id
+	for (index = 0; index < controller->remote_node_entries; index++) {
+		if ((controller->device_table[index] != NULL) &&
+		   (controller->device_table[index]->state_machine.current_state_id
 		    == SCI_BASE_REMOTE_DEVICE_STATE_STOPPING))
 			return true;
 	}