diff options
Diffstat (limited to 'drivers/acpi/utilities/utdebug.c')
-rw-r--r-- | drivers/acpi/utilities/utdebug.c | 95 |
1 files changed, 46 insertions, 49 deletions
diff --git a/drivers/acpi/utilities/utdebug.c b/drivers/acpi/utilities/utdebug.c index fd66ecb6741e..9a3538c497d0 100644 --- a/drivers/acpi/utilities/utdebug.c +++ b/drivers/acpi/utilities/utdebug.c | |||
@@ -42,6 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include <acpi/acpi.h> | 44 | #include <acpi/acpi.h> |
45 | #include <acpi/accommon.h> | ||
45 | 46 | ||
46 | #define _COMPONENT ACPI_UTILITIES | 47 | #define _COMPONENT ACPI_UTILITIES |
47 | ACPI_MODULE_NAME("utdebug") | 48 | ACPI_MODULE_NAME("utdebug") |
@@ -136,7 +137,7 @@ static const char *acpi_ut_trim_function_name(const char *function_name) | |||
136 | 137 | ||
137 | /******************************************************************************* | 138 | /******************************************************************************* |
138 | * | 139 | * |
139 | * FUNCTION: acpi_ut_debug_print | 140 | * FUNCTION: acpi_debug_print |
140 | * | 141 | * |
141 | * PARAMETERS: requested_debug_level - Requested debug print level | 142 | * PARAMETERS: requested_debug_level - Requested debug print level |
142 | * line_number - Caller's line number (for error output) | 143 | * line_number - Caller's line number (for error output) |
@@ -154,11 +155,11 @@ static const char *acpi_ut_trim_function_name(const char *function_name) | |||
154 | ******************************************************************************/ | 155 | ******************************************************************************/ |
155 | 156 | ||
156 | void ACPI_INTERNAL_VAR_XFACE | 157 | void ACPI_INTERNAL_VAR_XFACE |
157 | acpi_ut_debug_print(u32 requested_debug_level, | 158 | acpi_debug_print(u32 requested_debug_level, |
158 | u32 line_number, | 159 | u32 line_number, |
159 | const char *function_name, | 160 | const char *function_name, |
160 | const char *module_name, | 161 | const char *module_name, |
161 | u32 component_id, const char *format, ...) | 162 | u32 component_id, const char *format, ...) |
162 | { | 163 | { |
163 | acpi_thread_id thread_id; | 164 | acpi_thread_id thread_id; |
164 | va_list args; | 165 | va_list args; |
@@ -205,11 +206,11 @@ acpi_ut_debug_print(u32 requested_debug_level, | |||
205 | va_end(args); | 206 | va_end(args); |
206 | } | 207 | } |
207 | 208 | ||
208 | ACPI_EXPORT_SYMBOL(acpi_ut_debug_print) | 209 | ACPI_EXPORT_SYMBOL(acpi_debug_print) |
209 | 210 | ||
210 | /******************************************************************************* | 211 | /******************************************************************************* |
211 | * | 212 | * |
212 | * FUNCTION: acpi_ut_debug_print_raw | 213 | * FUNCTION: acpi_debug_print_raw |
213 | * | 214 | * |
214 | * PARAMETERS: requested_debug_level - Requested debug print level | 215 | * PARAMETERS: requested_debug_level - Requested debug print level |
215 | * line_number - Caller's line number | 216 | * line_number - Caller's line number |
@@ -226,11 +227,11 @@ ACPI_EXPORT_SYMBOL(acpi_ut_debug_print) | |||
226 | * | 227 | * |
227 | ******************************************************************************/ | 228 | ******************************************************************************/ |
228 | void ACPI_INTERNAL_VAR_XFACE | 229 | void ACPI_INTERNAL_VAR_XFACE |
229 | acpi_ut_debug_print_raw(u32 requested_debug_level, | 230 | acpi_debug_print_raw(u32 requested_debug_level, |
230 | u32 line_number, | 231 | u32 line_number, |
231 | const char *function_name, | 232 | const char *function_name, |
232 | const char *module_name, | 233 | const char *module_name, |
233 | u32 component_id, const char *format, ...) | 234 | u32 component_id, const char *format, ...) |
234 | { | 235 | { |
235 | va_list args; | 236 | va_list args; |
236 | 237 | ||
@@ -244,7 +245,7 @@ acpi_ut_debug_print_raw(u32 requested_debug_level, | |||
244 | va_end(args); | 245 | va_end(args); |
245 | } | 246 | } |
246 | 247 | ||
247 | ACPI_EXPORT_SYMBOL(acpi_ut_debug_print_raw) | 248 | ACPI_EXPORT_SYMBOL(acpi_debug_print_raw) |
248 | 249 | ||
249 | /******************************************************************************* | 250 | /******************************************************************************* |
250 | * | 251 | * |
@@ -270,9 +271,9 @@ acpi_ut_trace(u32 line_number, | |||
270 | acpi_gbl_nesting_level++; | 271 | acpi_gbl_nesting_level++; |
271 | acpi_ut_track_stack_ptr(); | 272 | acpi_ut_track_stack_ptr(); |
272 | 273 | ||
273 | acpi_ut_debug_print(ACPI_LV_FUNCTIONS, | 274 | acpi_debug_print(ACPI_LV_FUNCTIONS, |
274 | line_number, function_name, module_name, | 275 | line_number, function_name, module_name, component_id, |
275 | component_id, "%s\n", acpi_gbl_fn_entry_str); | 276 | "%s\n", acpi_gbl_fn_entry_str); |
276 | } | 277 | } |
277 | 278 | ||
278 | ACPI_EXPORT_SYMBOL(acpi_ut_trace) | 279 | ACPI_EXPORT_SYMBOL(acpi_ut_trace) |
@@ -301,10 +302,9 @@ acpi_ut_trace_ptr(u32 line_number, | |||
301 | acpi_gbl_nesting_level++; | 302 | acpi_gbl_nesting_level++; |
302 | acpi_ut_track_stack_ptr(); | 303 | acpi_ut_track_stack_ptr(); |
303 | 304 | ||
304 | acpi_ut_debug_print(ACPI_LV_FUNCTIONS, | 305 | acpi_debug_print(ACPI_LV_FUNCTIONS, |
305 | line_number, function_name, module_name, | 306 | line_number, function_name, module_name, component_id, |
306 | component_id, "%s %p\n", acpi_gbl_fn_entry_str, | 307 | "%s %p\n", acpi_gbl_fn_entry_str, pointer); |
307 | pointer); | ||
308 | } | 308 | } |
309 | 309 | ||
310 | /******************************************************************************* | 310 | /******************************************************************************* |
@@ -333,10 +333,9 @@ acpi_ut_trace_str(u32 line_number, | |||
333 | acpi_gbl_nesting_level++; | 333 | acpi_gbl_nesting_level++; |
334 | acpi_ut_track_stack_ptr(); | 334 | acpi_ut_track_stack_ptr(); |
335 | 335 | ||
336 | acpi_ut_debug_print(ACPI_LV_FUNCTIONS, | 336 | acpi_debug_print(ACPI_LV_FUNCTIONS, |
337 | line_number, function_name, module_name, | 337 | line_number, function_name, module_name, component_id, |
338 | component_id, "%s %s\n", acpi_gbl_fn_entry_str, | 338 | "%s %s\n", acpi_gbl_fn_entry_str, string); |
339 | string); | ||
340 | } | 339 | } |
341 | 340 | ||
342 | /******************************************************************************* | 341 | /******************************************************************************* |
@@ -365,10 +364,9 @@ acpi_ut_trace_u32(u32 line_number, | |||
365 | acpi_gbl_nesting_level++; | 364 | acpi_gbl_nesting_level++; |
366 | acpi_ut_track_stack_ptr(); | 365 | acpi_ut_track_stack_ptr(); |
367 | 366 | ||
368 | acpi_ut_debug_print(ACPI_LV_FUNCTIONS, | 367 | acpi_debug_print(ACPI_LV_FUNCTIONS, |
369 | line_number, function_name, module_name, | 368 | line_number, function_name, module_name, component_id, |
370 | component_id, "%s %08X\n", acpi_gbl_fn_entry_str, | 369 | "%s %08X\n", acpi_gbl_fn_entry_str, integer); |
371 | integer); | ||
372 | } | 370 | } |
373 | 371 | ||
374 | /******************************************************************************* | 372 | /******************************************************************************* |
@@ -393,9 +391,9 @@ acpi_ut_exit(u32 line_number, | |||
393 | const char *module_name, u32 component_id) | 391 | const char *module_name, u32 component_id) |
394 | { | 392 | { |
395 | 393 | ||
396 | acpi_ut_debug_print(ACPI_LV_FUNCTIONS, | 394 | acpi_debug_print(ACPI_LV_FUNCTIONS, |
397 | line_number, function_name, module_name, | 395 | line_number, function_name, module_name, component_id, |
398 | component_id, "%s\n", acpi_gbl_fn_exit_str); | 396 | "%s\n", acpi_gbl_fn_exit_str); |
399 | 397 | ||
400 | acpi_gbl_nesting_level--; | 398 | acpi_gbl_nesting_level--; |
401 | } | 399 | } |
@@ -426,17 +424,16 @@ acpi_ut_status_exit(u32 line_number, | |||
426 | { | 424 | { |
427 | 425 | ||
428 | if (ACPI_SUCCESS(status)) { | 426 | if (ACPI_SUCCESS(status)) { |
429 | acpi_ut_debug_print(ACPI_LV_FUNCTIONS, | 427 | acpi_debug_print(ACPI_LV_FUNCTIONS, |
430 | line_number, function_name, module_name, | 428 | line_number, function_name, module_name, |
431 | component_id, "%s %s\n", | 429 | component_id, "%s %s\n", acpi_gbl_fn_exit_str, |
432 | acpi_gbl_fn_exit_str, | 430 | acpi_format_exception(status)); |
433 | acpi_format_exception(status)); | ||
434 | } else { | 431 | } else { |
435 | acpi_ut_debug_print(ACPI_LV_FUNCTIONS, | 432 | acpi_debug_print(ACPI_LV_FUNCTIONS, |
436 | line_number, function_name, module_name, | 433 | line_number, function_name, module_name, |
437 | component_id, "%s ****Exception****: %s\n", | 434 | component_id, "%s ****Exception****: %s\n", |
438 | acpi_gbl_fn_exit_str, | 435 | acpi_gbl_fn_exit_str, |
439 | acpi_format_exception(status)); | 436 | acpi_format_exception(status)); |
440 | } | 437 | } |
441 | 438 | ||
442 | acpi_gbl_nesting_level--; | 439 | acpi_gbl_nesting_level--; |
@@ -467,10 +464,10 @@ acpi_ut_value_exit(u32 line_number, | |||
467 | u32 component_id, acpi_integer value) | 464 | u32 component_id, acpi_integer value) |
468 | { | 465 | { |
469 | 466 | ||
470 | acpi_ut_debug_print(ACPI_LV_FUNCTIONS, | 467 | acpi_debug_print(ACPI_LV_FUNCTIONS, |
471 | line_number, function_name, module_name, | 468 | line_number, function_name, module_name, component_id, |
472 | component_id, "%s %8.8X%8.8X\n", | 469 | "%s %8.8X%8.8X\n", acpi_gbl_fn_exit_str, |
473 | acpi_gbl_fn_exit_str, ACPI_FORMAT_UINT64(value)); | 470 | ACPI_FORMAT_UINT64(value)); |
474 | 471 | ||
475 | acpi_gbl_nesting_level--; | 472 | acpi_gbl_nesting_level--; |
476 | } | 473 | } |
@@ -499,9 +496,9 @@ acpi_ut_ptr_exit(u32 line_number, | |||
499 | const char *module_name, u32 component_id, u8 *ptr) | 496 | const char *module_name, u32 component_id, u8 *ptr) |
500 | { | 497 | { |
501 | 498 | ||
502 | acpi_ut_debug_print(ACPI_LV_FUNCTIONS, | 499 | acpi_debug_print(ACPI_LV_FUNCTIONS, |
503 | line_number, function_name, module_name, | 500 | line_number, function_name, module_name, component_id, |
504 | component_id, "%s %p\n", acpi_gbl_fn_exit_str, ptr); | 501 | "%s %p\n", acpi_gbl_fn_exit_str, ptr); |
505 | 502 | ||
506 | acpi_gbl_nesting_level--; | 503 | acpi_gbl_nesting_level--; |
507 | } | 504 | } |