Skip to content

Commit

Permalink
[PATCH] libata-dev: Use new ata_queue_pio_task() for PIO polling task
Browse files Browse the repository at this point in the history
  - 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>
  • Loading branch information
Albert Lee authored and Jeff Garzik committed Feb 9, 2006
1 parent aef9d53 commit 20ea079
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1072,12 +1072,6 @@ static unsigned int ata_pio_modes(const struct ata_device *adev)
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
ata_queue_pio_task(struct ata_port *ap)
{
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down

0 comments on commit 20ea079

Please sign in to comment.