Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20ea079e authored by Albert Lee's avatar Albert Lee Committed by Jeff Garzik
Browse files

[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: default avatarAlbert Lee <albertcc@tw.ibm.com>

===
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent aef9d533

drivers/scsi/libata-core.c

+3 −9
Original line number Diff line number Diff line
@@ -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)

{
@@ -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: