Commit 9ca461c0 authored by Jeff Garzik's avatar Jeff Garzik

[libata] internal cleanup: kill ata_pio_start

Integrate it into its caller.
parent bbb21036
...@@ -2021,26 +2021,6 @@ static unsigned long ata_pio_poll(struct ata_port *ap) ...@@ -2021,26 +2021,6 @@ static unsigned long ata_pio_poll(struct ata_port *ap)
return 0; return 0;
} }
/**
* ata_pio_start -
* @qc:
*
* LOCKING:
* spin_lock_irqsave(host_set lock)
*/
static void ata_pio_start (struct ata_queued_cmd *qc)
{
struct ata_port *ap = qc->ap;
assert(qc->tf.protocol == ATA_PROT_PIO);
qc->flags |= ATA_QCFLAG_POLL;
qc->tf.ctl |= ATA_NIEN; /* disable interrupts */
ata_tf_to_host_nolock(ap, &qc->tf);
queue_work(ata_wq, &ap->pio_task);
}
/** /**
* ata_pio_complete - * ata_pio_complete -
* @ap: * @ap:
...@@ -2443,6 +2423,7 @@ int ata_qc_issue(struct ata_queued_cmd *qc) ...@@ -2443,6 +2423,7 @@ int ata_qc_issue(struct ata_queued_cmd *qc)
* is slightly different. * is slightly different.
* *
* LOCKING: * LOCKING:
* spin_lock_irqsave(host_set lock)
* *
* RETURNS: * RETURNS:
* Zero on success, negative on error. * Zero on success, negative on error.
...@@ -2465,7 +2446,10 @@ static int ata_qc_issue_prot(struct ata_queued_cmd *qc) ...@@ -2465,7 +2446,10 @@ static int ata_qc_issue_prot(struct ata_queued_cmd *qc)
break; break;
case ATA_PROT_PIO: /* load tf registers, initiate polling pio */ case ATA_PROT_PIO: /* load tf registers, initiate polling pio */
ata_pio_start(qc); qc->flags |= ATA_QCFLAG_POLL;
qc->tf.ctl |= ATA_NIEN; /* disable interrupts */
ata_tf_to_host_nolock(ap, &qc->tf);
queue_work(ata_wq, &ap->pio_task);
break; break;
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment