[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>
This commit is contained in:
parent
aef9d533da
commit
20ea079e58
1 changed files with 3 additions and 9 deletions
|
@ -1072,12 +1072,6 @@ static unsigned int ata_pio_modes(const struct ata_device *adev)
|
||||||
timing API will get this right anyway */
|
timing API will get this right anyway */
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
|
||||||
ata_queue_packet_task(struct ata_port *ap)
|
|
||||||
{
|
|
||||||
queue_work(ata_wq, &ap->packet_task);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
ata_queue_pio_task(struct ata_port *ap)
|
ata_queue_pio_task(struct ata_port *ap)
|
||||||
{
|
{
|
||||||
|
@ -3971,7 +3965,7 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc)
|
||||||
ap->hsm_task_state = HSM_ST_LAST;
|
ap->hsm_task_state = HSM_ST_LAST;
|
||||||
|
|
||||||
if (qc->tf.flags & ATA_TFLAG_POLLING)
|
if (qc->tf.flags & ATA_TFLAG_POLLING)
|
||||||
queue_work(ata_wq, &ap->pio_task);
|
ata_queue_pio_task(ap);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -4024,7 +4018,7 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc)
|
||||||
/* send cdb by polling if no cdb interrupt */
|
/* send cdb by polling if no cdb interrupt */
|
||||||
if ((!(qc->dev->flags & ATA_DFLAG_CDB_INTR)) ||
|
if ((!(qc->dev->flags & ATA_DFLAG_CDB_INTR)) ||
|
||||||
(qc->tf.flags & ATA_TFLAG_POLLING))
|
(qc->tf.flags & ATA_TFLAG_POLLING))
|
||||||
ata_queue_packet_task(ap);
|
ata_queue_pio_task(ap);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ATA_PROT_ATAPI_DMA:
|
case ATA_PROT_ATAPI_DMA:
|
||||||
|
@ -4036,7 +4030,7 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc)
|
||||||
|
|
||||||
/* send cdb by polling if no cdb interrupt */
|
/* send cdb by polling if no cdb interrupt */
|
||||||
if (!(qc->dev->flags & ATA_DFLAG_CDB_INTR))
|
if (!(qc->dev->flags & ATA_DFLAG_CDB_INTR))
|
||||||
ata_queue_packet_task(ap);
|
ata_queue_pio_task(ap);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Add table
Reference in a new issue