From 1423391f8687fa049ff39dc57befce155063145c Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Tue, 13 Dec 2005 14:51:25 +0900
Subject: [PATCH] --- yaml --- r: 15865 b: refs/heads/master c:
 b5632303401c231bf270ef36f1013e52caf4caf9 h: refs/heads/master i:   15863:
 b177c49fa854567c07e39148f9965dc80d3b9734 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/scsi/libata-core.c | 14 ++------------
 trunk/include/linux/libata.h     |  2 --
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index b9723f7aefe5..4dc7021d4734 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82033adf0a4b26eb0c0c90e224848431e2a59bc6
+refs/heads/master: b5632303401c231bf270ef36f1013e52caf4caf9
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
index 1c4dbf3e9818..9ea102587914 100644
--- a/trunk/drivers/scsi/libata-core.c
+++ b/trunk/drivers/scsi/libata-core.c
@@ -3503,7 +3503,7 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
 static void __ata_qc_complete(struct ata_queued_cmd *qc)
 {
 	struct ata_port *ap = qc->ap;
-	unsigned int tag, do_clear = 0;
+	unsigned int tag;
 
 	qc->flags = 0;
 	tag = qc->tag;
@@ -3511,17 +3511,8 @@ static void __ata_qc_complete(struct ata_queued_cmd *qc)
 		if (tag == ap->active_tag)
 			ap->active_tag = ATA_TAG_POISON;
 		qc->tag = ATA_TAG_POISON;
-		do_clear = 1;
-	}
-
-	if (qc->waiting) {
-		struct completion *waiting = qc->waiting;
-		qc->waiting = NULL;
-		complete(waiting);
-	}
-
-	if (likely(do_clear))
 		clear_bit(tag, &ap->qactive);
+	}
 }
 
 /**
@@ -3537,7 +3528,6 @@ static void __ata_qc_complete(struct ata_queued_cmd *qc)
 void ata_qc_free(struct ata_queued_cmd *qc)
 {
 	assert(qc != NULL);	/* ata_qc_from_tag _might_ return NULL */
-	assert(qc->waiting == NULL);	/* nothing should be waiting */
 
 	__ata_qc_complete(qc);
 }
diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h
index 833e57afd54c..46337e71613e 100644
--- a/trunk/include/linux/libata.h
+++ b/trunk/include/linux/libata.h
@@ -285,8 +285,6 @@ struct ata_queued_cmd {
 
 	ata_qc_cb_t		complete_fn;
 
-	struct completion	*waiting;
-
 	void			*private_data;
 };