aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-03-05 01:29:09 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-11 17:57:21 -0500
commit2e755f68ee23b03484fde18d978f910cc5479cb8 (patch)
tree5b5947906b3ae286c1250f2bf7726263ce9579d7
parent507ceda00302c071029277652d9faa5a0a55419a (diff)
[PATCH] libata: rename ATA_FLAG_FLUSH_PIO_TASK to ATA_FLAG_FLUSH_PORT_TASK
Rename ATA_FLAG_FLUSH_PIO_TASK to ATA_FLAG_FLUSH_PORT_TASK. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/scsi/libata-core.c6
-rw-r--r--include/linux/libata.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 2974438d3bb7..6d8aa86f2f6b 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -742,7 +742,7 @@ void ata_port_queue_task(struct ata_port *ap, void (*fn)(void *), void *data,
742{ 742{
743 int rc; 743 int rc;
744 744
745 if (ap->flags & ATA_FLAG_FLUSH_PIO_TASK) 745 if (ap->flags & ATA_FLAG_FLUSH_PORT_TASK)
746 return; 746 return;
747 747
748 PREPARE_WORK(&ap->port_task, fn, data); 748 PREPARE_WORK(&ap->port_task, fn, data);
@@ -773,7 +773,7 @@ void ata_port_flush_task(struct ata_port *ap)
773 DPRINTK("ENTER\n"); 773 DPRINTK("ENTER\n");
774 774
775 spin_lock_irqsave(&ap->host_set->lock, flags); 775 spin_lock_irqsave(&ap->host_set->lock, flags);
776 ap->flags |= ATA_FLAG_FLUSH_PIO_TASK; 776 ap->flags |= ATA_FLAG_FLUSH_PORT_TASK;
777 spin_unlock_irqrestore(&ap->host_set->lock, flags); 777 spin_unlock_irqrestore(&ap->host_set->lock, flags);
778 778
779 DPRINTK("flush #1\n"); 779 DPRINTK("flush #1\n");
@@ -790,7 +790,7 @@ void ata_port_flush_task(struct ata_port *ap)
790 } 790 }
791 791
792 spin_lock_irqsave(&ap->host_set->lock, flags); 792 spin_lock_irqsave(&ap->host_set->lock, flags);
793 ap->flags &= ~ATA_FLAG_FLUSH_PIO_TASK; 793 ap->flags &= ~ATA_FLAG_FLUSH_PORT_TASK;
794 spin_unlock_irqrestore(&ap->host_set->lock, flags); 794 spin_unlock_irqrestore(&ap->host_set->lock, flags);
795 795
796 DPRINTK("EXIT\n"); 796 DPRINTK("EXIT\n");
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 9ad020ac8591..15674923cc84 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -151,7 +151,7 @@ enum {
151 ATA_FLAG_PIO_LBA48 = (1 << 13), /* Host DMA engine is LBA28 only */ 151 ATA_FLAG_PIO_LBA48 = (1 << 13), /* Host DMA engine is LBA28 only */
152 ATA_FLAG_IRQ_MASK = (1 << 14), /* Mask IRQ in PIO xfers */ 152 ATA_FLAG_IRQ_MASK = (1 << 14), /* Mask IRQ in PIO xfers */
153 153
154 ATA_FLAG_FLUSH_PIO_TASK = (1 << 15), /* Flush PIO task */ 154 ATA_FLAG_FLUSH_PORT_TASK = (1 << 15), /* Flush port task */
155 ATA_FLAG_IN_EH = (1 << 16), /* EH in progress */ 155 ATA_FLAG_IN_EH = (1 << 16), /* EH in progress */
156 156
157 ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */ 157 ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */