diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-08-19 18:53:36 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-10 23:31:49 -0400 |
commit | 2663f60d434139298835af690f4891cec5c1e501 (patch) | |
tree | 427ff822ffdf3929e21e98d20d48ba8646865daa /drivers/pnp/support.c | |
parent | 668b21de141edcba3fb13a4f810641eea4740fd7 (diff) |
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/support.c')
-rw-r--r-- | drivers/pnp/support.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c index b42df1620718..714918655e04 100644 --- a/drivers/pnp/support.c +++ b/drivers/pnp/support.c | |||
@@ -75,7 +75,6 @@ char *pnp_resource_type_name(struct resource *res) | |||
75 | 75 | ||
76 | void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc) | 76 | void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc) |
77 | { | 77 | { |
78 | #ifdef DEBUG | ||
79 | char buf[128]; | 78 | char buf[128]; |
80 | int len; | 79 | int len; |
81 | struct pnp_resource *pnp_res; | 80 | struct pnp_resource *pnp_res; |
@@ -118,7 +117,6 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc) | |||
118 | } | 117 | } |
119 | dev_dbg(&dev->dev, "%s\n", buf); | 118 | dev_dbg(&dev->dev, "%s\n", buf); |
120 | } | 119 | } |
121 | #endif | ||
122 | } | 120 | } |
123 | 121 | ||
124 | char *pnp_option_priority_name(struct pnp_option *option) | 122 | char *pnp_option_priority_name(struct pnp_option *option) |
@@ -136,7 +134,6 @@ char *pnp_option_priority_name(struct pnp_option *option) | |||
136 | 134 | ||
137 | void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option) | 135 | void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option) |
138 | { | 136 | { |
139 | #ifdef DEBUG | ||
140 | char buf[128]; | 137 | char buf[128]; |
141 | int len = 0, i; | 138 | int len = 0, i; |
142 | struct pnp_port *port; | 139 | struct pnp_port *port; |
@@ -209,5 +206,4 @@ void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option) | |||
209 | break; | 206 | break; |
210 | } | 207 | } |
211 | dev_dbg(&dev->dev, "%s\n", buf); | 208 | dev_dbg(&dev->dev, "%s\n", buf); |
212 | #endif | ||
213 | } | 209 | } |