diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-08-20 00:53:36 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-11 05:31:49 +0200 |
| commit | 2663f60d434139298835af690f4891cec5c1e501 (patch) | |
| tree | 427ff822ffdf3929e21e98d20d48ba8646865daa /drivers/pnp/core.c | |
| parent | PNP: use new vsprintf symbolic function pointer format (diff) | |
| download | linux-2663f60d434139298835af690f4891cec5c1e501.tar.xz linux-2663f60d434139298835af690f4891cec5c1e501.zip | |
PNP: remove some uses of DEBUG ifdef
Use scnprintf() to build up a buffer of PNP IDs to print. This
makes the printk atomic and helps get rid of an #ifdef.
Also remove an "#ifdef DEBUG" from some debug functions. The
functions only produce debug output, so it's OK to run the
function and just have the output be dropped at the end.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/core.c')
| -rw-r--r-- | drivers/pnp/core.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c index a411582bcd72..7cb1ffc14d4e 100644 --- a/drivers/pnp/core.c +++ b/drivers/pnp/core.c @@ -185,6 +185,9 @@ int __pnp_add_device(struct pnp_dev *dev) int pnp_add_device(struct pnp_dev *dev) { int ret; + char buf[128]; + int len = 0; + struct pnp_id *id; if (dev->card) return -EINVAL; @@ -193,17 +196,12 @@ int pnp_add_device(struct pnp_dev *dev) if (ret) return ret; -#ifdef CONFIG_PNP_DEBUG - { - struct pnp_id *id; + buf[0] = '\0'; + for (id = dev->id; id; id = id->next) + len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id); - dev_printk(KERN_DEBUG, &dev->dev, "%s device, IDs", - dev->protocol->name); - for (id = dev->id; id; id = id->next) - printk(" %s", id->id); - printk(" (%s)\n", dev->active ? "active" : "disabled"); - } -#endif + dev_dbg(&dev->dev, "%s device, IDs%s (%s)\n", + dev->protocol->name, buf, dev->active ? "active" : "disabled"); return 0; } |