diff options
| author | Albert Lee <albertcc@tw.ibm.com> | 2006-02-08 16:48:49 +0800 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:26:12 -0500 |
| commit | 20ea079e5883ab2b82fa5e576957f52e4e5c252c (patch) | |
| tree | b29d55ec3c4e4df846914365ad0c5a7eecbb2408 | |
| parent | aef9d533da2eb7a5700a8c8700f2597c35cc50d1 (diff) | |
[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>
| -rw-r--r-- | drivers/scsi/libata-core.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index dab13ed6fa7..bbce1622eb7 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -1073,12 +1073,6 @@ static unsigned int ata_pio_modes(const struct ata_device *adev) } 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 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc) 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 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc) /* 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 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc) /* 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: |