From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Use iomap_name() in the libata layer
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Tejun Heo <htejun@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/ata/libata-core.c | 11 ++++++-----
include/linux/libata.h | 9 ++++++---
2 files changed, 12 insertions(+), 8 deletions(-)
diff -puN drivers/ata/libata-core.c~ata-use-iomap_name drivers/ata/libata-core.c
--- a/drivers/ata/libata-core.c~ata-use-iomap_name
+++ a/drivers/ata/libata-core.c
@@ -6354,6 +6354,7 @@ void ata_host_init(struct ata_host *host
int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
{
int i, rc;
+ char ctlbuf[IOMAP_NAMELEN], cmdbuf[IOMAP_NAMELEN], dmabuf[IOMAP_NAMELEN];
/* host must have been started */
if (!(host->flags & ATA_HOST_STARTED)) {
@@ -6410,13 +6411,13 @@ int ata_host_register(struct ata_host *h
/* print per-port info to dmesg */
if (!ata_port_is_dummy(ap))
- ata_port_printk(ap, KERN_INFO, "%cATA max %s cmd 0x%p "
- "ctl 0x%p bmdma 0x%p irq %d\n",
+ ata_port_printk(ap, KERN_INFO, "%cATA max %s cmd %s "
+ "ctl %s bmdma %s irq %d\n",
(ap->flags & ATA_FLAG_SATA) ? 'S' : 'P',
ata_mode_string(xfer_mask),
- ap->ioaddr.cmd_addr,
- ap->ioaddr.ctl_addr,
- ap->ioaddr.bmdma_addr,
+ iomap_name(ap->ioaddr.cmd_addr, cmdbuf, sizeof(cmdbuf)),
+ iomap_name(ap->ioaddr.ctl_addr, ctlbuf, sizeof(ctlbuf)),
+ iomap_name(ap->ioaddr.bmdma_addr, dmabuf, sizeof(dmabuf)),
irq_line);
else
ata_port_printk(ap, KERN_INFO, "DUMMY\n");
diff -puN include/linux/libata.h~ata-use-iomap_name include/linux/libata.h
--- a/include/linux/libata.h~ata-use-iomap_name
+++ a/include/linux/libata.h
@@ -1114,11 +1114,14 @@ static inline u8 ata_busy_wait(struct at
static inline u8 ata_wait_idle(struct ata_port *ap)
{
+ char buf[IOMAP_NAMELEN];
u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
- if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ)))
- DPRINTK("ATA: abnormal status 0x%X on port 0x%p\n",
- status, ap->ioaddr.status_addr);
+ if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ))) {
+ if (ata_msg_warn(ap))
+ printk(KERN_WARNING "ATA: abnormal status 0x%X on port %s\n",
+ status, iomap_name(ap->ioaddr.status_addr, buf, sizeof(buf)));
+ }
return status;
}
_
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
