---

yaml --- r: 254438 b: refs/heads/master c: be2f41c h: refs/heads/master v: v3
git-mirror · Jul 3, 2011 · 23fd8a0 · 23fd8a0
1 parent 7f4720b
commit 23fd8a0
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 110 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 890cae9b8a7defd87feb1ec77a2affd25bd59cce
+refs/heads/master: be2f41c611b65353fa3ae0c155cf906b348dc864
diff --git a/trunk/drivers/scsi/isci/core/sci_base_state.h b/trunk/drivers/scsi/isci/core/sci_base_state.h
@@ -56,8 +56,6 @@
 #ifndef _SCI_BASE_STATE_H_
 #define _SCI_BASE_STATE_H_
 
-#include "sci_object.h"
-
 typedef void (*sci_base_state_handler_t)(void);
 
 typedef void (*sci_state_transition_t)(void *base_object);

diff --git a/trunk/drivers/scsi/isci/core/sci_object.h b/trunk/drivers/scsi/isci/core/sci_object.h
diff --git a/trunk/drivers/scsi/isci/core/scic_io_request.h b/trunk/drivers/scsi/isci/core/scic_io_request.h
@@ -161,8 +161,7 @@ enum sci_status scic_io_request_construct(
  * if the remote_device does not support the SSP protocol.
  * SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not
  * properly set the association between the SCIC IO request and the user's IO
- * request.  Please refer to the sci_object_set_association() routine for more
- * information.
+ * request.
  */
 enum sci_status scic_io_request_construct_basic_ssp(
 	struct scic_sds_request *scic_io_request);
@@ -184,8 +183,7 @@ enum sci_status scic_io_request_construct_basic_ssp(
  * if the remote_device does not support the STP protocol.
  * SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not
  * properly set the association between the SCIC IO request and the user's IO
- * request.  Please refer to the sci_object_set_association() routine for more
- * information.
+ * request.
  */
 enum sci_status scic_io_request_construct_basic_sata(
 	struct scic_sds_request *scic_io_request);
@@ -206,8 +204,7 @@ enum sci_status scic_io_request_construct_basic_sata(
  * if the remote_device does not support the SMP protocol.
  * SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not
  * properly set the association between the SCIC IO request and the user's IO
- * request.  Please refer to the sci_object_set_association() routine for more
- * information.
+ * request.
  */
 enum sci_status scic_io_request_construct_smp(
 	struct scic_sds_request *scic_io_request);

diff --git a/trunk/drivers/scsi/isci/core/scic_sds_smp_request.c b/trunk/drivers/scsi/isci/core/scic_sds_smp_request.c
@@ -574,8 +574,7 @@ static const struct sci_base_state scic_sds_smp_request_started_substate_table[]
  * if the remote_device does not support the SMP protocol.
  * SCI_FAILURE_INVALID_ASSOCIATION This value is returned if the user did not
  * properly set the association between the SCIC IO request and the user's IO
- * request.  Please refer to the sci_object_set_association() routine for more
- * information.
+ * request.
  */
 enum sci_status scic_io_request_construct_smp(struct scic_sds_request *sci_req)
 {

diff --git a/trunk/drivers/scsi/isci/isci.h b/trunk/drivers/scsi/isci/isci.h
@@ -65,7 +65,6 @@
 #include <scsi/libsas.h>
 #include <scsi/scsi.h>
 
-#include "core/sci_object.h"
 #include "scic_controller.h"
 #include "host.h"
 #include "timers.h"