提交 999bb6f4 编写于 作者: A Albert Lee 提交者: Jeff Garzik

[PATCH] libata-dev: irq-pio minor fixes (respin)

irq-pio minor fixes for printk() and comments.
Signed-off-by: NAlbert Lee <albertcc@tw.ibm.com>
Signed-off-by: NJeff Garzik <jeff@garzik.org>
上级 c234fb00
...@@ -1295,7 +1295,7 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev, ...@@ -1295,7 +1295,7 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,
if (dev->id[59] & 0x100) { if (dev->id[59] & 0x100) {
dev->multi_count = dev->id[59] & 0xff; dev->multi_count = dev->id[59] & 0xff;
DPRINTK("ata%u: dev %u multi count %u\n", 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; dev->cdb_len = 16;
...@@ -3594,6 +3594,9 @@ static int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, ...@@ -3594,6 +3594,9 @@ static int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc,
} }
fsm_start: 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) { switch (ap->hsm_task_state) {
case HSM_ST_FIRST: case HSM_ST_FIRST:
/* Send first data block or PACKET CDB */ /* Send first data block or PACKET CDB */
...@@ -3720,6 +3723,7 @@ static int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, ...@@ -3720,6 +3723,7 @@ static int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc,
ap->hsm_task_state = HSM_ST_IDLE; ap->hsm_task_state = HSM_ST_IDLE;
/* complete taskfile transaction */
if (in_wq) if (in_wq)
ata_poll_qc_complete(qc); ata_poll_qc_complete(qc);
else else
...@@ -4241,9 +4245,6 @@ inline unsigned int ata_host_intr (struct ata_port *ap, ...@@ -4241,9 +4245,6 @@ inline unsigned int ata_host_intr (struct ata_port *ap,
if (unlikely(status & ATA_BUSY)) if (unlikely(status & ATA_BUSY))
goto idle_irq; 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 */ /* ack bmdma irq events */
ap->ops->irq_clear(ap); ap->ops->irq_clear(ap);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册