diff options
Diffstat (limited to 'drivers/pnp/support.c')
-rw-r--r-- | drivers/pnp/support.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c index b42df1620718..63087d5ce609 100644 --- a/drivers/pnp/support.c +++ b/drivers/pnp/support.c | |||
@@ -75,18 +75,17 @@ 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; |
82 | struct resource *res; | 81 | struct resource *res; |
83 | 82 | ||
84 | if (list_empty(&dev->resources)) { | 83 | if (list_empty(&dev->resources)) { |
85 | dev_dbg(&dev->dev, "%s: no current resources\n", desc); | 84 | pnp_dbg(&dev->dev, "%s: no current resources\n", desc); |
86 | return; | 85 | return; |
87 | } | 86 | } |
88 | 87 | ||
89 | dev_dbg(&dev->dev, "%s: current resources:\n", desc); | 88 | pnp_dbg(&dev->dev, "%s: current resources:\n", desc); |
90 | list_for_each_entry(pnp_res, &dev->resources, list) { | 89 | list_for_each_entry(pnp_res, &dev->resources, list) { |
91 | res = &pnp_res->res; | 90 | res = &pnp_res->res; |
92 | len = 0; | 91 | len = 0; |
@@ -95,7 +94,7 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc) | |||
95 | pnp_resource_type_name(res)); | 94 | pnp_resource_type_name(res)); |
96 | 95 | ||
97 | if (res->flags & IORESOURCE_DISABLED) { | 96 | if (res->flags & IORESOURCE_DISABLED) { |
98 | dev_dbg(&dev->dev, "%sdisabled\n", buf); | 97 | pnp_dbg(&dev->dev, "%sdisabled\n", buf); |
99 | continue; | 98 | continue; |
100 | } | 99 | } |
101 | 100 | ||
@@ -116,9 +115,8 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc) | |||
116 | res->flags); | 115 | res->flags); |
117 | break; | 116 | break; |
118 | } | 117 | } |
119 | dev_dbg(&dev->dev, "%s\n", buf); | 118 | pnp_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; |
@@ -208,6 +205,5 @@ void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option) | |||
208 | "flags %#x", dma->map, dma->flags); | 205 | "flags %#x", dma->map, dma->flags); |
209 | break; | 206 | break; |
210 | } | 207 | } |
211 | dev_dbg(&dev->dev, "%s\n", buf); | 208 | pnp_dbg(&dev->dev, "%s\n", buf); |
212 | #endif | ||
213 | } | 209 | } |