[PATCH] libata-dev: irq-pio minor fixes (respin)
irq-pio minor fixes for printk() and comments.
Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 27078c0..d68f5d5 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1295,7 +1295,7 @@
if (dev->id[59] & 0x100) {
dev->multi_count = dev->id[59] & 0xff;
DPRINTK("ata%u: dev %u multi count %u\n",
- ap->id, device, dev->multi_count);
+ ap->id, dev->devno, dev->multi_count);
}
dev->cdb_len = 16;
@@ -3594,6 +3594,9 @@
}
fsm_start:
+ DPRINTK("ata%u: protocol %d task_state %d (dev_stat 0x%X)\n",
+ ap->id, qc->tf.protocol, ap->hsm_task_state, status);
+
switch (ap->hsm_task_state) {
case HSM_ST_FIRST:
/* Send first data block or PACKET CDB */
@@ -3720,6 +3723,7 @@
ap->hsm_task_state = HSM_ST_IDLE;
+ /* complete taskfile transaction */
if (in_wq)
ata_poll_qc_complete(qc);
else
@@ -4241,9 +4245,6 @@
if (unlikely(status & ATA_BUSY))
goto idle_irq;
- DPRINTK("ata%u: protocol %d task_state %d (dev_stat 0x%X)\n",
- ap->id, qc->tf.protocol, ap->hsm_task_state, status);
-
/* ack bmdma irq events */
ap->ops->irq_clear(ap);