Use dev_printk() when possible for more informative error messages.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---
drivers/pnp/isapnp/core.c | 38 ++++++++++++++++++--------------------
drivers/pnp/pnpacpi/rsparser.c | 20 ++++++++++++--------
drivers/pnp/pnpbios/rsparser.c | 36 ++++++++++++++----------------------
3 files changed, 44 insertions(+), 50 deletions(-)
Index: work7/drivers/pnp/isapnp/core.c
===================================================================
--- work7.orig/drivers/pnp/isapnp/core.c 2008-03-31 17:10:59.000000000 -0600
+++ work7/drivers/pnp/isapnp/core.c 2008-03-31 17:12:17.000000000 -0600
@@ -729,9 +729,8 @@
isapnp_skip_bytes(size);
return 1;
default:
- printk(KERN_ERR
- "isapnp: unexpected or unknown tag type 0x%x for logical device %i (device %i), ignored\n",
- type, dev->number, card->number);
+ dev_err(&dev->dev, "unknown tag 0x%x (card %i), "
+ "ignored\n", type, card->number);
}
__skip:
if (size > 0)
@@ -784,9 +783,8 @@
isapnp_skip_bytes(size);
return;
default:
- printk(KERN_ERR
- "isapnp: unexpected or unknown tag type 0x%x for device %i, ignored\n",
- type, card->number);
+ dev_err(&card->dev, "unknown tag 0x%x, ignored\n",
+ type);
}
__skip:
if (size > 0)
@@ -833,13 +831,6 @@
isapnp_wake(csn);
isapnp_peek(header, 9);
checksum = isapnp_checksum(header);
-#if 0
- printk(KERN_DEBUG
- "vendor: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
- header[0], header[1], header[2], header[3], header[4],
- header[5], header[6], header[7], header[8]);
- printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
-#endif
eisa_id = header[0] | header[1] << 8 |
header[2] << 16 | header[3] << 24;
pnp_eisa_id_to_string(eisa_id, id);
@@ -847,6 +838,13 @@
if (!card)
continue;
+#if 0
+ dev_info(&card->dev,
+ "vendor: ...
