[PATCH] libata-dev: Use new ata_queue_pio_task() for PIO polling task
- Use new ata_queue_pio_task() for PIO polling task.
- Remove the unused ata_queue_packet_task() function.
(irq-pio had merged the 2 queues into one.)
Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
===
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index dab13ed..bbce162 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1073,12 +1073,6 @@
}
static inline void
-ata_queue_packet_task(struct ata_port *ap)
-{
- queue_work(ata_wq, &ap->packet_task);
-}
-
-static inline void
ata_queue_pio_task(struct ata_port *ap)
{
queue_work(ata_wq, &ap->pio_task);
@@ -3971,7 +3965,7 @@
ap->hsm_task_state = HSM_ST_LAST;
if (qc->tf.flags & ATA_TFLAG_POLLING)
- queue_work(ata_wq, &ap->pio_task);
+ ata_queue_pio_task(ap);
break;
@@ -4024,7 +4018,7 @@
/* send cdb by polling if no cdb interrupt */
if ((!(qc->dev->flags & ATA_DFLAG_CDB_INTR)) ||
(qc->tf.flags & ATA_TFLAG_POLLING))
- ata_queue_packet_task(ap);
+ ata_queue_pio_task(ap);
break;
case ATA_PROT_ATAPI_DMA:
@@ -4036,7 +4030,7 @@
/* send cdb by polling if no cdb interrupt */
if (!(qc->dev->flags & ATA_DFLAG_CDB_INTR))
- ata_queue_packet_task(ap);
+ ata_queue_pio_task(ap);
break;
default: