diff options
author | Tejun Heo <htejun@gmail.com> | 2007-07-30 01:23:03 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-12 14:55:34 -0400 |
commit | 1552945669b4fb23bff8d3b30221bfe3ade63515 (patch) | |
tree | 843dc8ad2a108a1fcea95bf503cc4cb1abd848ca /include/linux/libata.h | |
parent | b8773531cc54c1ed10c8ec301353ee6b53b601a5 (diff) |
libata: use ata_port_printk() in ata_wait_idle()
ata_wait_idle() identified controller by printing out the address of
the Status register. This is bogus because 1. it's iomapped address
2. some controllers don't have Status register and don't initialize
the field. Use ata_port_printk() instead.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r-- | include/linux/libata.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index d98e8b50e20c..86cc0491b35e 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -1182,9 +1182,11 @@ static inline u8 ata_wait_idle(struct ata_port *ap) | |||
1182 | { | 1182 | { |
1183 | u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000); | 1183 | u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000); |
1184 | 1184 | ||
1185 | #ifdef ATA_DEBUG | ||
1185 | if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ))) | 1186 | if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ))) |
1186 | DPRINTK("ATA: abnormal status 0x%X on port 0x%p\n", | 1187 | ata_port_printk(ap, KERN_DEBUG, "abnormal Status 0x%X\n", |
1187 | status, ap->ioaddr.status_addr); | 1188 | status); |
1189 | #endif | ||
1188 | 1190 | ||
1189 | return status; | 1191 | return status; |
1190 | } | 1192 | } |