---

yaml --- r: 254409 b: refs/heads/master c: 41e2b90 h: refs/heads/master i: 254407: 166fefe v: v3
git-mirror · Jul 3, 2011 · 40c2ebf · 40c2ebf
1 parent e3acc67
commit 40c2ebf
Show file tree

Hide file tree

Showing 6 changed files with 286 additions and 525 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ea99d52cbcdb4bf5f5dd3097088a2919a115981
+refs/heads/master: 41e2b90584695cf5ae3a29eaa115e31913fbefe0
diff --git a/trunk/drivers/scsi/isci/core/sci_base_port.h b/trunk/drivers/scsi/isci/core/sci_base_port.h
diff --git a/trunk/drivers/scsi/isci/core/scic_sds_controller.c b/trunk/drivers/scsi/isci/core/scic_sds_controller.c
@@ -616,10 +616,10 @@ static enum sci_status scic_sds_controller_stop_ports(struct scic_sds_controller
 
 	for (index = 0; index < scic->logical_port_entries; index++) {
 		struct scic_sds_port *sci_port = &scic->port_table[index];
-		sci_base_port_handler_t stop;
+		scic_sds_port_handler_t stop;
 
-		stop = sci_port->state_handlers->parent.stop_handler;
-		port_status = stop(&sci_port->parent);
+		stop = sci_port->state_handlers->stop_handler;
+		port_status = stop(sci_port);
 
 		if ((port_status != SCI_SUCCESS) &&
 		    (port_status != SCI_FAILURE_INVALID_STATE)) {
@@ -2860,8 +2860,8 @@ enum sci_status scic_controller_start(struct scic_sds_controller *scic,
 	for (index = 0; index < scic->logical_port_entries; index++) {
 		struct scic_sds_port *sci_port = &scic->port_table[index];
 
-		result = sci_port->state_handlers->parent.start_handler(
-				&sci_port->parent);
+		result = sci_port->state_handlers->start_handler(
+				sci_port);
 		if (result)
 			return result;
 	}