[PATCH] libata-eh-fw: implement new EH scheduling via error completion

[linux-2.6] / include / linux / libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index bfcefdca06164ed1b383556a4679904925edc967..6023f324e68e694cdd6f8efa281c7735349dd630 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -605,7 +605,7 @@ extern void ata_bmdma_start (struct ata_queued_cmd *qc);
 extern void ata_bmdma_stop(struct ata_queued_cmd *qc);
 extern u8   ata_bmdma_status(struct ata_port *ap);
 extern void ata_bmdma_irq_clear(struct ata_port *ap);
-extern void __ata_qc_complete(struct ata_queued_cmd *qc);
+extern void ata_qc_complete(struct ata_queued_cmd *qc);
 extern void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd,
                              void (*done)(struct scsi_cmnd *));
 extern int ata_std_bios_param(struct scsi_device *sdev,
@@ -882,31 +882,6 @@ static inline void ata_qc_reinit(struct ata_queued_cmd *qc)
        qc->result_tf.feature = 0;
 }
 
-/**
- *     ata_qc_complete - Complete an active ATA command
- *     @qc: Command to complete
- *     @err_mask: ATA Status register contents
- *
- *     Indicate to the mid and upper layers that an ATA
- *     command has completed, with either an ok or not-ok status.
- *
- *     LOCKING:
- *     spin_lock_irqsave(host_set lock)
- */
-static inline void ata_qc_complete(struct ata_queued_cmd *qc)
-{
-       struct ata_port *ap = qc->ap;
-
-       if (unlikely(qc->flags & ATA_QCFLAG_EH_SCHEDULED))
-               return;
-
-       /* read result TF if failed or requested */
-       if (qc->err_mask || qc->flags & ATA_QCFLAG_RESULT_TF)
-               ap->ops->tf_read(ap, &qc->result_tf);
-
-       __ata_qc_complete(qc);
-}
-
 /**
  *     ata_irq_on - Enable interrupts on a port.
  *     @ap: Port on which interrupts are enabled.