diff options
author | Tejun Heo <htejun@gmail.com> | 2006-05-15 07:57:56 -0400 |
---|---|---|
committer | Tejun Heo <htejun@gmail.com> | 2006-05-15 07:57:56 -0400 |
commit | f15a1dafed22d5037e0feea7528e1eeb28a1a7a3 (patch) | |
tree | 5bf5c98332036d62bd4cca3a104844faa318c712 /drivers/scsi/ahci.c | |
parent | 61440db61fe4945ad9f7b32b4d6a22b17174aa1f (diff) |
[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.c | 8 |
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) | |||
655 | fail_restart: | 655 | fail_restart: |
656 | ahci_start_engine(ap); | 656 | ahci_start_engine(ap); |
657 | fail: | 657 | fail: |
658 | printk(KERN_ERR "ata%u: softreset failed (%s)\n", | 658 | ata_port_printk(ap, KERN_ERR, "softreset failed (%s)\n", reason); |
659 | ap->id, reason); | ||
660 | return rc; | 659 | return rc; |
661 | } | 660 | } |
662 | 661 | ||
@@ -798,9 +797,8 @@ static void ahci_restart_port(struct ata_port *ap, u32 irq_stat) | |||
798 | 797 | ||
799 | if ((ap->device[0].class != ATA_DEV_ATAPI) || | 798 | if ((ap->device[0].class != ATA_DEV_ATAPI) || |
800 | ((irq_stat & PORT_IRQ_TF_ERR) == 0)) | 799 | ((irq_stat & PORT_IRQ_TF_ERR) == 0)) |
801 | printk(KERN_WARNING "ata%u: port reset, " | 800 | ata_port_printk(ap, KERN_WARNING, "port reset, " |
802 | "p_is %x is %x pis %x cmd %x tf %x ss %x se %x\n", | 801 | "p_is %x is %x pis %x cmd %x tf %x ss %x se %x\n", |
803 | ap->id, | ||
804 | irq_stat, | 802 | irq_stat, |
805 | readl(mmio + HOST_IRQ_STAT), | 803 | readl(mmio + HOST_IRQ_STAT), |
806 | readl(port_mmio + PORT_IRQ_STAT), | 804 | readl(port_mmio + PORT_IRQ_STAT), |
@@ -840,7 +838,7 @@ static void ahci_eng_timeout(struct ata_port *ap) | |||
840 | struct ata_queued_cmd *qc; | 838 | struct ata_queued_cmd *qc; |
841 | unsigned long flags; | 839 | unsigned long flags; |
842 | 840 | ||
843 | printk(KERN_WARNING "ata%u: handling error/timeout\n", ap->id); | 841 | ata_port_printk(ap, KERN_WARNING, "handling error/timeout\n"); |
844 | 842 | ||
845 | spin_lock_irqsave(&host_set->lock, flags); | 843 | spin_lock_irqsave(&host_set->lock, flags); |
846 | 844 | ||