Skip to content

Commit

Permalink
[PATCH] libata: rename ATA_FLAG_FLUSH_PIO_TASK to ATA_FLAG_FLUSH_PORT…
Browse files Browse the repository at this point in the history
…_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>
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Mar 11, 2006
1 parent 507ceda commit 2e755f6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ void ata_port_queue_task(struct ata_port *ap, void (*fn)(void *), void *data,
{
int rc;

if (ap->flags & ATA_FLAG_FLUSH_PIO_TASK)
if (ap->flags & ATA_FLAG_FLUSH_PORT_TASK)
return;

PREPARE_WORK(&ap->port_task, fn, data);
Expand Down Expand Up @@ -773,7 +773,7 @@ void ata_port_flush_task(struct ata_port *ap)
DPRINTK("ENTER\n");

spin_lock_irqsave(&ap->host_set->lock, flags);
ap->flags |= ATA_FLAG_FLUSH_PIO_TASK;
ap->flags |= ATA_FLAG_FLUSH_PORT_TASK;
spin_unlock_irqrestore(&ap->host_set->lock, flags);

DPRINTK("flush #1\n");
Expand All @@ -790,7 +790,7 @@ void ata_port_flush_task(struct ata_port *ap)
}

spin_lock_irqsave(&ap->host_set->lock, flags);
ap->flags &= ~ATA_FLAG_FLUSH_PIO_TASK;
ap->flags &= ~ATA_FLAG_FLUSH_PORT_TASK;
spin_unlock_irqrestore(&ap->host_set->lock, flags);

DPRINTK("EXIT\n");
Expand Down
2 changes: 1 addition & 1 deletion include/linux/libata.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ enum {
ATA_FLAG_PIO_LBA48 = (1 << 13), /* Host DMA engine is LBA28 only */
ATA_FLAG_IRQ_MASK = (1 << 14), /* Mask IRQ in PIO xfers */

ATA_FLAG_FLUSH_PIO_TASK = (1 << 15), /* Flush PIO task */
ATA_FLAG_FLUSH_PORT_TASK = (1 << 15), /* Flush port task */
ATA_FLAG_IN_EH = (1 << 16), /* EH in progress */

ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */
Expand Down

0 comments on commit 2e755f6

Please sign in to comment.