2 files changed, 2 insertions, 14 deletions

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 1c4dbf3e9818..9ea102587914 100644
--- a/drivers/scsi/libata-core.c
+++ b/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/include/linux/libata.h b/include/linux/libata.h
index 833e57afd54c..46337e71613e 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -285,8 +285,6 @@ struct ata_queued_cmd {
 
         ata_qc_cb_t             complete_fn;
 
-        struct completion       *waiting;
-
         void                    *private_data;
 };