OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Bjorn Helgaas 2008-08-19 16:53:36 -06:00 committed by Len Brown
parent 668b21de14
commit 2663f60d43
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/pnp/core.c
View File

@ -185,6 +185,9 @@ int __pnp_add_device(struct pnp_dev *dev)
int pnp_add_device(struct pnp_dev *dev) int pnp_add_device(struct pnp_dev *dev)
{ {
int ret; int ret;
char buf[128];
int len = 0;
struct pnp_id *id;
if (dev->card) if (dev->card)
return -EINVAL; return -EINVAL;
@ -193,17 +196,12 @@ int pnp_add_device(struct pnp_dev *dev)
if (ret) if (ret)
return ret; return ret;
#ifdef CONFIG_PNP_DEBUG buf[0] = '\0';
{ for (id = dev->id; id; id = id->next)
struct pnp_id *id; len += scnprintf(buf + len, sizeof(buf) - len, " %s", id->id);
dev_printk(KERN_DEBUG, &dev->dev, "%s device, IDs", dev_dbg(&dev->dev, "%s device, IDs%s (%s)\n",
dev->protocol->name); dev->protocol->name, buf, dev->active ? "active" : "disabled");
for (id = dev->id; id; id = id->next)
printk(" %s", id->id);
printk(" (%s)\n", dev->active ? "active" : "disabled");
}
#endif
return 0; return 0;
} }

4
drivers/pnp/support.c
View File

@ -75,7 +75,6 @@ char *pnp_resource_type_name(struct resource *res)
void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc) void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
{ {
#ifdef DEBUG
char buf[128]; char buf[128];
int len; int len;
struct pnp_resource *pnp_res; struct pnp_resource *pnp_res;
@ -118,7 +117,6 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
} }
dev_dbg(&dev->dev, "%s\n", buf); dev_dbg(&dev->dev, "%s\n", buf);
} }
#endif
} }
char *pnp_option_priority_name(struct pnp_option *option) char *pnp_option_priority_name(struct pnp_option *option)
@ -136,7 +134,6 @@ char *pnp_option_priority_name(struct pnp_option *option)
void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option) void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option)
{ {
#ifdef DEBUG
char buf[128]; char buf[128];
int len = 0, i; int len = 0, i;
struct pnp_port *port; struct pnp_port *port;
@ -209,5 +206,4 @@ void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option)
break; break;
} }
dev_dbg(&dev->dev, "%s\n", buf); dev_dbg(&dev->dev, "%s\n", buf);
#endif
} }