aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ahci.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-05-15 20:57:56 +0900
committerTejun Heo <htejun@gmail.com>2006-05-15 20:57:56 +0900
commitf15a1dafed22d5037e0feea7528e1eeb28a1a7a3 (patch)
tree5bf5c98332036d62bd4cca3a104844faa318c712 /drivers/scsi/ahci.c
parent[PATCH] libata: implement ATA printk helpers (diff)
downloadlinux-dev-f15a1dafed22d5037e0feea7528e1eeb28a1a7a3.tar.xz
linux-dev-f15a1dafed22d5037e0feea7528e1eeb28a1a7a3.zip
[PATCH] libata: use ATA printk helpers
Use ATA printk helpers. Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/scsi/ahci.c')
-rw-r--r--drivers/scsi/ahci.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index f6e4c8ea74e3..a4fb8d0a6c08 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -655,8 +655,7 @@ static int ahci_softreset(struct ata_port *ap, unsigned int *class)
fail_restart:
ahci_start_engine(ap);
fail:
- printk(KERN_ERR "ata%u: softreset failed (%s)\n",
- ap->id, reason);
+ ata_port_printk(ap, KERN_ERR, "softreset failed (%s)\n", reason);
return rc;
}
@@ -798,9 +797,8 @@ static void ahci_restart_port(struct ata_port *ap, u32 irq_stat)
if ((ap->device[0].class != ATA_DEV_ATAPI) ||
((irq_stat & PORT_IRQ_TF_ERR) == 0))
- printk(KERN_WARNING "ata%u: port reset, "
+ ata_port_printk(ap, KERN_WARNING, "port reset, "
"p_is %x is %x pis %x cmd %x tf %x ss %x se %x\n",
- ap->id,
irq_stat,
readl(mmio + HOST_IRQ_STAT),
readl(port_mmio + PORT_IRQ_STAT),
@@ -840,7 +838,7 @@ static void ahci_eng_timeout(struct ata_port *ap)
struct ata_queued_cmd *qc;
unsigned long flags;
- printk(KERN_WARNING "ata%u: handling error/timeout\n", ap->id);
+ ata_port_printk(ap, KERN_WARNING, "handling error/timeout\n");
spin_lock_irqsave(&host_set->lock, flags);