aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/events
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/events')
-rw-r--r--drivers/acpi/events/evevent.c19
-rw-r--r--drivers/acpi/events/evgpe.c42
-rw-r--r--drivers/acpi/events/evgpeblk.c50
-rw-r--r--drivers/acpi/events/evmisc.c20
-rw-r--r--drivers/acpi/events/evregion.c44
-rw-r--r--drivers/acpi/events/evrgnini.c6
-rw-r--r--drivers/acpi/events/evxface.c12
-rw-r--r--drivers/acpi/events/evxfevnt.c20
8 files changed, 136 insertions, 77 deletions
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index b380ae1044b7..c9ac05c4685f 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.c
@@ -73,7 +73,7 @@ acpi_status acpi_ev_initialize_events(void)
73 /* Make sure we have ACPI tables */ 73 /* Make sure we have ACPI tables */
74 74
75 if (!acpi_gbl_DSDT) { 75 if (!acpi_gbl_DSDT) {
76 ACPI_REPORT_WARNING(("No ACPI tables present!\n")); 76 ACPI_WARNING((AE_INFO, "No ACPI tables present!"));
77 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 77 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
78 } 78 }
79 79
@@ -84,14 +84,15 @@ acpi_status acpi_ev_initialize_events(void)
84 */ 84 */
85 status = acpi_ev_fixed_event_initialize(); 85 status = acpi_ev_fixed_event_initialize();
86 if (ACPI_FAILURE(status)) { 86 if (ACPI_FAILURE(status)) {
87 ACPI_REPORT_ERROR(("Unable to initialize fixed events, %s\n", 87 ACPI_EXCEPTION((AE_INFO, status,
88 acpi_format_exception(status))); 88 "Unable to initialize fixed events"));
89 return_ACPI_STATUS(status); 89 return_ACPI_STATUS(status);
90 } 90 }
91 91
92 status = acpi_ev_gpe_initialize(); 92 status = acpi_ev_gpe_initialize();
93 if (ACPI_FAILURE(status)) { 93 if (ACPI_FAILURE(status)) {
94 ACPI_REPORT_ERROR(("Unable to initialize general purpose events, %s\n", acpi_format_exception(status))); 94 ACPI_EXCEPTION((AE_INFO, status,
95 "Unable to initialize general purpose events"));
95 return_ACPI_STATUS(status); 96 return_ACPI_STATUS(status);
96 } 97 }
97 98
@@ -162,7 +163,8 @@ acpi_status acpi_ev_install_xrupt_handlers(void)
162 163
163 status = acpi_ev_install_sci_handler(); 164 status = acpi_ev_install_sci_handler();
164 if (ACPI_FAILURE(status)) { 165 if (ACPI_FAILURE(status)) {
165 ACPI_REPORT_ERROR(("Unable to install System Control Interrupt Handler, %s\n", acpi_format_exception(status))); 166 ACPI_EXCEPTION((AE_INFO, status,
167 "Unable to install System Control Interrupt handler"));
166 return_ACPI_STATUS(status); 168 return_ACPI_STATUS(status);
167 } 169 }
168 170
@@ -170,7 +172,8 @@ acpi_status acpi_ev_install_xrupt_handlers(void)
170 172
171 status = acpi_ev_init_global_lock_handler(); 173 status = acpi_ev_init_global_lock_handler();
172 if (ACPI_FAILURE(status)) { 174 if (ACPI_FAILURE(status)) {
173 ACPI_REPORT_ERROR(("Unable to initialize Global Lock handler, %s\n", acpi_format_exception(status))); 175 ACPI_EXCEPTION((AE_INFO, status,
176 "Unable to initialize Global Lock handler"));
174 return_ACPI_STATUS(status); 177 return_ACPI_STATUS(status);
175 } 178 }
176 179
@@ -304,7 +307,9 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
304 enable_register_id, 0, 307 enable_register_id, 0,
305 ACPI_MTX_DO_NOT_LOCK); 308 ACPI_MTX_DO_NOT_LOCK);
306 309
307 ACPI_REPORT_ERROR(("No installed handler for fixed event [%08X]\n", event)); 310 ACPI_ERROR((AE_INFO,
311 "No installed handler for fixed event [%08X]",
312 event));
308 313
309 return (ACPI_INTERRUPT_NOT_HANDLED); 314 return (ACPI_INTERRUPT_NOT_HANDLED);
310 } 315 }
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index 353b907edbfa..f64f977dd3d5 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -379,7 +379,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
379 u8 enabled_status_byte; 379 u8 enabled_status_byte;
380 u32 status_reg; 380 u32 status_reg;
381 u32 enable_reg; 381 u32 enable_reg;
382 acpi_native_uint flags; 382 acpi_cpu_flags flags;
383 acpi_native_uint i; 383 acpi_native_uint i;
384 acpi_native_uint j; 384 acpi_native_uint j;
385 385
@@ -546,7 +546,11 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
546 546
547 status = acpi_ns_evaluate_by_handle(&info); 547 status = acpi_ns_evaluate_by_handle(&info);
548 if (ACPI_FAILURE(status)) { 548 if (ACPI_FAILURE(status)) {
549 ACPI_REPORT_ERROR(("%s while evaluating method [%4.4s] for GPE[%2X]\n", acpi_format_exception(status), acpi_ut_get_node_name(local_gpe_event_info.dispatch.method_node), gpe_number)); 549 ACPI_EXCEPTION((AE_INFO, status,
550 "While evaluating method [%4.4s] for GPE[%2X]",
551 acpi_ut_get_node_name
552 (local_gpe_event_info.dispatch.
553 method_node), gpe_number));
550 } 554 }
551 } 555 }
552 556
@@ -599,9 +603,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
599 ACPI_GPE_EDGE_TRIGGERED) { 603 ACPI_GPE_EDGE_TRIGGERED) {
600 status = acpi_hw_clear_gpe(gpe_event_info); 604 status = acpi_hw_clear_gpe(gpe_event_info);
601 if (ACPI_FAILURE(status)) { 605 if (ACPI_FAILURE(status)) {
602 ACPI_REPORT_ERROR(("%s, Unable to clear GPE[%2X]\n", 606 ACPI_EXCEPTION((AE_INFO, status,
603 acpi_format_exception(status), 607 "Unable to clear GPE[%2X]",
604 gpe_number)); 608 gpe_number));
605 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); 609 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
606 } 610 }
607 } 611 }
@@ -639,7 +643,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
639 ACPI_GPE_LEVEL_TRIGGERED) { 643 ACPI_GPE_LEVEL_TRIGGERED) {
640 status = acpi_hw_clear_gpe(gpe_event_info); 644 status = acpi_hw_clear_gpe(gpe_event_info);
641 if (ACPI_FAILURE(status)) { 645 if (ACPI_FAILURE(status)) {
642 ACPI_REPORT_ERROR(("%s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number)); 646 ACPI_EXCEPTION((AE_INFO, status,
647 "Unable to clear GPE[%2X]",
648 gpe_number));
643 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); 649 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
644 } 650 }
645 } 651 }
@@ -653,9 +659,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
653 */ 659 */
654 status = acpi_ev_disable_gpe(gpe_event_info); 660 status = acpi_ev_disable_gpe(gpe_event_info);
655 if (ACPI_FAILURE(status)) { 661 if (ACPI_FAILURE(status)) {
656 ACPI_REPORT_ERROR(("%s, Unable to disable GPE[%2X]\n", 662 ACPI_EXCEPTION((AE_INFO, status,
657 acpi_format_exception(status), 663 "Unable to disable GPE[%2X]",
658 gpe_number)); 664 gpe_number));
659 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); 665 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
660 } 666 }
661 667
@@ -667,7 +673,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
667 acpi_ev_asynch_execute_gpe_method, 673 acpi_ev_asynch_execute_gpe_method,
668 gpe_event_info); 674 gpe_event_info);
669 if (ACPI_FAILURE(status)) { 675 if (ACPI_FAILURE(status)) {
670 ACPI_REPORT_ERROR(("%s, Unable to queue handler for GPE[%2X] - event disabled\n", acpi_format_exception(status), gpe_number)); 676 ACPI_EXCEPTION((AE_INFO, status,
677 "Unable to queue handler for GPE[%2X] - event disabled",
678 gpe_number));
671 } 679 }
672 break; 680 break;
673 681
@@ -675,7 +683,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
675 683
676 /* No handler or method to run! */ 684 /* No handler or method to run! */
677 685
678 ACPI_REPORT_ERROR(("No handler or method for GPE[%2X], disabling event\n", gpe_number)); 686 ACPI_ERROR((AE_INFO,
687 "No handler or method for GPE[%2X], disabling event",
688 gpe_number));
679 689
680 /* 690 /*
681 * Disable the GPE. The GPE will remain disabled until the ACPI 691 * Disable the GPE. The GPE will remain disabled until the ACPI
@@ -683,9 +693,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
683 */ 693 */
684 status = acpi_ev_disable_gpe(gpe_event_info); 694 status = acpi_ev_disable_gpe(gpe_event_info);
685 if (ACPI_FAILURE(status)) { 695 if (ACPI_FAILURE(status)) {
686 ACPI_REPORT_ERROR(("%s, Unable to disable GPE[%2X]\n", 696 ACPI_EXCEPTION((AE_INFO, status,
687 acpi_format_exception(status), 697 "Unable to disable GPE[%2X]",
688 gpe_number)); 698 gpe_number));
689 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); 699 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
690 } 700 }
691 break; 701 break;
@@ -728,7 +738,9 @@ acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info)
728 738
729 acpi_ev_set_gpe_type(gpe_event_info, ACPI_GPE_TYPE_WAKE); 739 acpi_ev_set_gpe_type(gpe_event_info, ACPI_GPE_TYPE_WAKE);
730 740
731 ACPI_REPORT_INFO(("GPE %p was updated from wake/run to wake-only\n", gpe_event_info)); 741 ACPI_INFO((AE_INFO,
742 "GPE %p was updated from wake/run to wake-only",
743 gpe_event_info));
732 744
733 /* This was a wake-only GPE */ 745 /* This was a wake-only GPE */
734 746
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index 3b9bbdda551d..0fd00b5ad650 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -136,7 +136,7 @@ acpi_status acpi_ev_walk_gpe_list(ACPI_GPE_CALLBACK gpe_walk_callback)
136 struct acpi_gpe_block_info *gpe_block; 136 struct acpi_gpe_block_info *gpe_block;
137 struct acpi_gpe_xrupt_info *gpe_xrupt_info; 137 struct acpi_gpe_xrupt_info *gpe_xrupt_info;
138 acpi_status status = AE_OK; 138 acpi_status status = AE_OK;
139 acpi_native_uint flags; 139 acpi_cpu_flags flags;
140 140
141 ACPI_FUNCTION_TRACE("ev_walk_gpe_list"); 141 ACPI_FUNCTION_TRACE("ev_walk_gpe_list");
142 142
@@ -279,7 +279,9 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
279 default: 279 default:
280 /* Unknown method type, just ignore it! */ 280 /* Unknown method type, just ignore it! */
281 281
282 ACPI_REPORT_ERROR(("Unknown GPE method type: %s (name not of form _Lxx or _Exx)\n", name)); 282 ACPI_ERROR((AE_INFO,
283 "Unknown GPE method type: %s (name not of form _Lxx or _Exx)",
284 name));
283 return_ACPI_STATUS(AE_OK); 285 return_ACPI_STATUS(AE_OK);
284 } 286 }
285 287
@@ -289,7 +291,9 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
289 if (gpe_number == ACPI_UINT32_MAX) { 291 if (gpe_number == ACPI_UINT32_MAX) {
290 /* Conversion failed; invalid method, just ignore it */ 292 /* Conversion failed; invalid method, just ignore it */
291 293
292 ACPI_REPORT_ERROR(("Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)\n", name)); 294 ACPI_ERROR((AE_INFO,
295 "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)",
296 name));
293 return_ACPI_STATUS(AE_OK); 297 return_ACPI_STATUS(AE_OK);
294 } 298 }
295 299
@@ -476,7 +480,7 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
476 struct acpi_gpe_xrupt_info *next_gpe_xrupt; 480 struct acpi_gpe_xrupt_info *next_gpe_xrupt;
477 struct acpi_gpe_xrupt_info *gpe_xrupt; 481 struct acpi_gpe_xrupt_info *gpe_xrupt;
478 acpi_status status; 482 acpi_status status;
479 acpi_native_uint flags; 483 acpi_cpu_flags flags;
480 484
481 ACPI_FUNCTION_TRACE("ev_get_gpe_xrupt_block"); 485 ACPI_FUNCTION_TRACE("ev_get_gpe_xrupt_block");
482 486
@@ -523,7 +527,9 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
523 acpi_ev_gpe_xrupt_handler, 527 acpi_ev_gpe_xrupt_handler,
524 gpe_xrupt); 528 gpe_xrupt);
525 if (ACPI_FAILURE(status)) { 529 if (ACPI_FAILURE(status)) {
526 ACPI_REPORT_ERROR(("Could not install GPE interrupt handler at level 0x%X\n", interrupt_number)); 530 ACPI_ERROR((AE_INFO,
531 "Could not install GPE interrupt handler at level 0x%X",
532 interrupt_number));
527 return_PTR(NULL); 533 return_PTR(NULL);
528 } 534 }
529 } 535 }
@@ -548,7 +554,7 @@ static acpi_status
548acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt) 554acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
549{ 555{
550 acpi_status status; 556 acpi_status status;
551 acpi_native_uint flags; 557 acpi_cpu_flags flags;
552 558
553 ACPI_FUNCTION_TRACE("ev_delete_gpe_xrupt"); 559 ACPI_FUNCTION_TRACE("ev_delete_gpe_xrupt");
554 560
@@ -606,7 +612,7 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
606 struct acpi_gpe_block_info *next_gpe_block; 612 struct acpi_gpe_block_info *next_gpe_block;
607 struct acpi_gpe_xrupt_info *gpe_xrupt_block; 613 struct acpi_gpe_xrupt_info *gpe_xrupt_block;
608 acpi_status status; 614 acpi_status status;
609 acpi_native_uint flags; 615 acpi_cpu_flags flags;
610 616
611 ACPI_FUNCTION_TRACE("ev_install_gpe_block"); 617 ACPI_FUNCTION_TRACE("ev_install_gpe_block");
612 618
@@ -659,7 +665,7 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
659acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block) 665acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block)
660{ 666{
661 acpi_status status; 667 acpi_status status;
662 acpi_native_uint flags; 668 acpi_cpu_flags flags;
663 669
664 ACPI_FUNCTION_TRACE("ev_install_gpe_block"); 670 ACPI_FUNCTION_TRACE("ev_install_gpe_block");
665 671
@@ -739,7 +745,8 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
739 sizeof(struct 745 sizeof(struct
740 acpi_gpe_register_info)); 746 acpi_gpe_register_info));
741 if (!gpe_register_info) { 747 if (!gpe_register_info) {
742 ACPI_REPORT_ERROR(("Could not allocate the gpe_register_info table\n")); 748 ACPI_ERROR((AE_INFO,
749 "Could not allocate the gpe_register_info table"));
743 return_ACPI_STATUS(AE_NO_MEMORY); 750 return_ACPI_STATUS(AE_NO_MEMORY);
744 } 751 }
745 752
@@ -752,7 +759,8 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
752 ACPI_GPE_REGISTER_WIDTH) * 759 ACPI_GPE_REGISTER_WIDTH) *
753 sizeof(struct acpi_gpe_event_info)); 760 sizeof(struct acpi_gpe_event_info));
754 if (!gpe_event_info) { 761 if (!gpe_event_info) {
755 ACPI_REPORT_ERROR(("Could not allocate the gpe_event_info table\n")); 762 ACPI_ERROR((AE_INFO,
763 "Could not allocate the gpe_event_info table"));
756 status = AE_NO_MEMORY; 764 status = AE_NO_MEMORY;
757 goto error_exit; 765 goto error_exit;
758 } 766 }
@@ -1032,8 +1040,8 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
1032 1040
1033 status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block); 1041 status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block);
1034 if (ACPI_FAILURE(status)) { 1042 if (ACPI_FAILURE(status)) {
1035 ACPI_REPORT_ERROR(("Could not enable GPEs in gpe_block %p\n", 1043 ACPI_ERROR((AE_INFO, "Could not enable GPEs in gpe_block %p",
1036 gpe_block)); 1044 gpe_block));
1037 } 1045 }
1038 1046
1039 return_ACPI_STATUS(status); 1047 return_ACPI_STATUS(status);
@@ -1107,8 +1115,8 @@ acpi_status acpi_ev_gpe_initialize(void)
1107 &acpi_gbl_gpe_fadt_blocks[0]); 1115 &acpi_gbl_gpe_fadt_blocks[0]);
1108 1116
1109 if (ACPI_FAILURE(status)) { 1117 if (ACPI_FAILURE(status)) {
1110 ACPI_REPORT_ERROR(("Could not create GPE Block 0, %s\n", 1118 ACPI_EXCEPTION((AE_INFO, status,
1111 acpi_format_exception(status))); 1119 "Could not create GPE Block 0"));
1112 } 1120 }
1113 } 1121 }
1114 1122
@@ -1121,7 +1129,12 @@ acpi_status acpi_ev_gpe_initialize(void)
1121 1129
1122 if ((register_count0) && 1130 if ((register_count0) &&
1123 (gpe_number_max >= acpi_gbl_FADT->gpe1_base)) { 1131 (gpe_number_max >= acpi_gbl_FADT->gpe1_base)) {
1124 ACPI_REPORT_ERROR(("GPE0 block (GPE 0 to %d) overlaps the GPE1 block (GPE %d to %d) - Ignoring GPE1\n", gpe_number_max, acpi_gbl_FADT->gpe1_base, acpi_gbl_FADT->gpe1_base + ((register_count1 * ACPI_GPE_REGISTER_WIDTH) - 1))); 1132 ACPI_ERROR((AE_INFO,
1133 "GPE0 block (GPE 0 to %d) overlaps the GPE1 block (GPE %d to %d) - Ignoring GPE1",
1134 gpe_number_max, acpi_gbl_FADT->gpe1_base,
1135 acpi_gbl_FADT->gpe1_base +
1136 ((register_count1 *
1137 ACPI_GPE_REGISTER_WIDTH) - 1)));
1125 1138
1126 /* Ignore GPE1 block by setting the register count to zero */ 1139 /* Ignore GPE1 block by setting the register count to zero */
1127 1140
@@ -1139,7 +1152,8 @@ acpi_status acpi_ev_gpe_initialize(void)
1139 [1]); 1152 [1]);
1140 1153
1141 if (ACPI_FAILURE(status)) { 1154 if (ACPI_FAILURE(status)) {
1142 ACPI_REPORT_ERROR(("Could not create GPE Block 1, %s\n", acpi_format_exception(status))); 1155 ACPI_EXCEPTION((AE_INFO, status,
1156 "Could not create GPE Block 1"));
1143 } 1157 }
1144 1158
1145 /* 1159 /*
@@ -1165,7 +1179,9 @@ acpi_status acpi_ev_gpe_initialize(void)
1165 /* Check for Max GPE number out-of-range */ 1179 /* Check for Max GPE number out-of-range */
1166 1180
1167 if (gpe_number_max > ACPI_GPE_MAX) { 1181 if (gpe_number_max > ACPI_GPE_MAX) {
1168 ACPI_REPORT_ERROR(("Maximum GPE number from FADT is too large: 0x%X\n", gpe_number_max)); 1182 ACPI_ERROR((AE_INFO,
1183 "Maximum GPE number from FADT is too large: 0x%X",
1184 gpe_number_max));
1169 status = AE_BAD_VALUE; 1185 status = AE_BAD_VALUE;
1170 goto cleanup; 1186 goto cleanup;
1171 } 1187 }
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index 78883239784a..0909ba69577e 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -303,7 +303,8 @@ static void ACPI_SYSTEM_XFACE acpi_ev_global_lock_thread(void *context)
303 acpi_os_signal_semaphore(acpi_gbl_global_lock_semaphore, 303 acpi_os_signal_semaphore(acpi_gbl_global_lock_semaphore,
304 acpi_gbl_global_lock_thread_count); 304 acpi_gbl_global_lock_thread_count);
305 if (ACPI_FAILURE(status)) { 305 if (ACPI_FAILURE(status)) {
306 ACPI_REPORT_ERROR(("Could not signal Global Lock semaphore\n")); 306 ACPI_ERROR((AE_INFO,
307 "Could not signal Global Lock semaphore"));
307 } 308 }
308 } 309 }
309} 310}
@@ -344,7 +345,8 @@ static u32 acpi_ev_global_lock_handler(void *context)
344 acpi_ev_global_lock_thread, 345 acpi_ev_global_lock_thread,
345 context); 346 context);
346 if (ACPI_FAILURE(status)) { 347 if (ACPI_FAILURE(status)) {
347 ACPI_REPORT_ERROR(("Could not queue Global Lock thread, %s\n", acpi_format_exception(status))); 348 ACPI_EXCEPTION((AE_INFO, status,
349 "Could not queue Global Lock thread"));
348 350
349 return (ACPI_INTERRUPT_NOT_HANDLED); 351 return (ACPI_INTERRUPT_NOT_HANDLED);
350 } 352 }
@@ -384,7 +386,8 @@ acpi_status acpi_ev_init_global_lock_handler(void)
384 * with an error. 386 * with an error.
385 */ 387 */
386 if (status == AE_NO_HARDWARE_RESPONSE) { 388 if (status == AE_NO_HARDWARE_RESPONSE) {
387 ACPI_REPORT_ERROR(("No response from Global Lock hardware, disabling lock\n")); 389 ACPI_ERROR((AE_INFO,
390 "No response from Global Lock hardware, disabling lock"));
388 391
389 acpi_gbl_global_lock_present = FALSE; 392 acpi_gbl_global_lock_present = FALSE;
390 status = AE_OK; 393 status = AE_OK;
@@ -480,7 +483,8 @@ acpi_status acpi_ev_release_global_lock(void)
480 ACPI_FUNCTION_TRACE("ev_release_global_lock"); 483 ACPI_FUNCTION_TRACE("ev_release_global_lock");
481 484
482 if (!acpi_gbl_global_lock_thread_count) { 485 if (!acpi_gbl_global_lock_thread_count) {
483 ACPI_REPORT_WARNING(("Cannot release HW Global Lock, it has not been acquired\n")); 486 ACPI_WARNING((AE_INFO,
487 "Cannot release HW Global Lock, it has not been acquired"));
484 return_ACPI_STATUS(AE_NOT_ACQUIRED); 488 return_ACPI_STATUS(AE_NOT_ACQUIRED);
485 } 489 }
486 490
@@ -542,7 +546,9 @@ void acpi_ev_terminate(void)
542 for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) { 546 for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
543 status = acpi_disable_event((u32) i, 0); 547 status = acpi_disable_event((u32) i, 0);
544 if (ACPI_FAILURE(status)) { 548 if (ACPI_FAILURE(status)) {
545 ACPI_REPORT_ERROR(("Could not disable fixed event %d\n", (u32) i)); 549 ACPI_ERROR((AE_INFO,
550 "Could not disable fixed event %d",
551 (u32) i));
546 } 552 }
547 } 553 }
548 554
@@ -554,7 +560,7 @@ void acpi_ev_terminate(void)
554 560
555 status = acpi_ev_remove_sci_handler(); 561 status = acpi_ev_remove_sci_handler();
556 if (ACPI_FAILURE(status)) { 562 if (ACPI_FAILURE(status)) {
557 ACPI_REPORT_ERROR(("Could not remove SCI handler\n")); 563 ACPI_ERROR((AE_INFO, "Could not remove SCI handler"));
558 } 564 }
559 } 565 }
560 566
@@ -567,7 +573,7 @@ void acpi_ev_terminate(void)
567 if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) { 573 if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) {
568 status = acpi_disable(); 574 status = acpi_disable();
569 if (ACPI_FAILURE(status)) { 575 if (ACPI_FAILURE(status)) {
570 ACPI_REPORT_WARNING(("acpi_disable failed\n")); 576 ACPI_WARNING((AE_INFO, "acpi_disable failed"));
571 } 577 }
572 } 578 }
573 return_VOID; 579 return_VOID;
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 900e5b32e595..6da58e776413 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -295,11 +295,12 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
295 295
296 handler_desc = region_obj->region.handler; 296 handler_desc = region_obj->region.handler;
297 if (!handler_desc) { 297 if (!handler_desc) {
298 ACPI_REPORT_ERROR(("No handler for Region [%4.4s] (%p) [%s]\n", 298 ACPI_ERROR((AE_INFO,
299 acpi_ut_get_node_name(region_obj->region. 299 "No handler for Region [%4.4s] (%p) [%s]",
300 node), region_obj, 300 acpi_ut_get_node_name(region_obj->region.node),
301 acpi_ut_get_region_name(region_obj->region. 301 region_obj,
302 space_id))); 302 acpi_ut_get_region_name(region_obj->region.
303 space_id)));
303 304
304 return_ACPI_STATUS(AE_NOT_EXIST); 305 return_ACPI_STATUS(AE_NOT_EXIST);
305 } 306 }
@@ -316,7 +317,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
316 if (!region_setup) { 317 if (!region_setup) {
317 /* No initialization routine, exit with error */ 318 /* No initialization routine, exit with error */
318 319
319 ACPI_REPORT_ERROR(("No init routine for region(%p) [%s]\n", region_obj, acpi_ut_get_region_name(region_obj->region.space_id))); 320 ACPI_ERROR((AE_INFO,
321 "No init routine for region(%p) [%s]",
322 region_obj,
323 acpi_ut_get_region_name(region_obj->region.
324 space_id)));
320 return_ACPI_STATUS(AE_NOT_EXIST); 325 return_ACPI_STATUS(AE_NOT_EXIST);
321 } 326 }
322 327
@@ -341,11 +346,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
341 /* Check for failure of the Region Setup */ 346 /* Check for failure of the Region Setup */
342 347
343 if (ACPI_FAILURE(status)) { 348 if (ACPI_FAILURE(status)) {
344 ACPI_REPORT_ERROR(("Region Initialization: %s [%s]\n", 349 ACPI_EXCEPTION((AE_INFO, status,
345 acpi_format_exception(status), 350 "During region initialization: [%s]",
346 acpi_ut_get_region_name(region_obj-> 351 acpi_ut_get_region_name(region_obj->
347 region. 352 region.
348 space_id))); 353 space_id)));
349 return_ACPI_STATUS(status); 354 return_ACPI_STATUS(status);
350 } 355 }
351 356
@@ -399,10 +404,9 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
399 region_obj2->extra.region_context); 404 region_obj2->extra.region_context);
400 405
401 if (ACPI_FAILURE(status)) { 406 if (ACPI_FAILURE(status)) {
402 ACPI_REPORT_ERROR(("Handler for [%s] returned %s\n", 407 ACPI_EXCEPTION((AE_INFO, status, "Returned by Handler for [%s]",
403 acpi_ut_get_region_name(region_obj->region. 408 acpi_ut_get_region_name(region_obj->region.
404 space_id), 409 space_id)));
405 acpi_format_exception(status)));
406 } 410 }
407 411
408 if (! 412 if (!
@@ -494,7 +498,10 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
494 498
495 status = acpi_ev_execute_reg_method(region_obj, 0); 499 status = acpi_ev_execute_reg_method(region_obj, 0);
496 if (ACPI_FAILURE(status)) { 500 if (ACPI_FAILURE(status)) {
497 ACPI_REPORT_ERROR(("%s from region _REG, [%s]\n", acpi_format_exception(status), acpi_ut_get_region_name(region_obj->region.space_id))); 501 ACPI_EXCEPTION((AE_INFO, status,
502 "from region _REG, [%s]",
503 acpi_ut_get_region_name
504 (region_obj->region.space_id)));
498 } 505 }
499 506
500 if (acpi_ns_is_locked) { 507 if (acpi_ns_is_locked) {
@@ -516,7 +523,10 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
516 /* Init routine may fail, Just ignore errors */ 523 /* Init routine may fail, Just ignore errors */
517 524
518 if (ACPI_FAILURE(status)) { 525 if (ACPI_FAILURE(status)) {
519 ACPI_REPORT_ERROR(("%s from region init, [%s]\n", acpi_format_exception(status), acpi_ut_get_region_name(region_obj->region.space_id))); 526 ACPI_EXCEPTION((AE_INFO, status,
527 "from region init, [%s]",
528 acpi_ut_get_region_name
529 (region_obj->region.space_id)));
520 } 530 }
521 531
522 region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE); 532 region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index de1a38e9ce22..baed8c1a1b9f 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -233,7 +233,11 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
233 */ 233 */
234 status = AE_OK; 234 status = AE_OK;
235 } else { 235 } else {
236 ACPI_REPORT_ERROR(("Could not install pci_config handler for Root Bridge %4.4s, %s\n", acpi_ut_get_node_name(pci_root_node), acpi_format_exception(status))); 236 ACPI_EXCEPTION((AE_INFO,
237 status,
238 "Could not install pci_config handler for Root Bridge %4.4s",
239 acpi_ut_get_node_name
240 (pci_root_node)));
237 } 241 }
238 } 242 }
239 break; 243 break;
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index b2f69b1ac4b5..b38b39dde543 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -143,8 +143,8 @@ acpi_install_fixed_event_handler(u32 event,
143 if (ACPI_SUCCESS(status)) 143 if (ACPI_SUCCESS(status))
144 status = acpi_enable_event(event, 0); 144 status = acpi_enable_event(event, 0);
145 if (ACPI_FAILURE(status)) { 145 if (ACPI_FAILURE(status)) {
146 ACPI_REPORT_WARNING(("Could not enable fixed event %X\n", 146 ACPI_WARNING((AE_INFO, "Could not enable fixed event %X",
147 event)); 147 event));
148 148
149 /* Remove the handler */ 149 /* Remove the handler */
150 150
@@ -204,7 +204,9 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler)
204 acpi_gbl_fixed_event_handlers[event].context = NULL; 204 acpi_gbl_fixed_event_handlers[event].context = NULL;
205 205
206 if (ACPI_FAILURE(status)) { 206 if (ACPI_FAILURE(status)) {
207 ACPI_REPORT_WARNING(("Could not write to fixed event enable register %X\n", event)); 207 ACPI_WARNING((AE_INFO,
208 "Could not write to fixed event enable register %X",
209 event));
208 } else { 210 } else {
209 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X\n", 211 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X\n",
210 event)); 212 event));
@@ -561,7 +563,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
561 struct acpi_gpe_event_info *gpe_event_info; 563 struct acpi_gpe_event_info *gpe_event_info;
562 struct acpi_handler_info *handler; 564 struct acpi_handler_info *handler;
563 acpi_status status; 565 acpi_status status;
564 acpi_native_uint flags; 566 acpi_cpu_flags flags;
565 567
566 ACPI_FUNCTION_TRACE("acpi_install_gpe_handler"); 568 ACPI_FUNCTION_TRACE("acpi_install_gpe_handler");
567 569
@@ -652,7 +654,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
652 struct acpi_gpe_event_info *gpe_event_info; 654 struct acpi_gpe_event_info *gpe_event_info;
653 struct acpi_handler_info *handler; 655 struct acpi_handler_info *handler;
654 acpi_status status; 656 acpi_status status;
655 acpi_native_uint flags; 657 acpi_cpu_flags flags;
656 658
657 ACPI_FUNCTION_TRACE("acpi_remove_gpe_handler"); 659 ACPI_FUNCTION_TRACE("acpi_remove_gpe_handler");
658 660
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index 90eb7939e986..ec9ce8429f15 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.c
@@ -70,7 +70,7 @@ acpi_status acpi_enable(void)
70 /* Make sure we have the FADT */ 70 /* Make sure we have the FADT */
71 71
72 if (!acpi_gbl_FADT) { 72 if (!acpi_gbl_FADT) {
73 ACPI_REPORT_WARNING(("No FADT information present!\n")); 73 ACPI_WARNING((AE_INFO, "No FADT information present!"));
74 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 74 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
75 } 75 }
76 76
@@ -82,7 +82,8 @@ acpi_status acpi_enable(void)
82 82
83 status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI); 83 status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI);
84 if (ACPI_FAILURE(status)) { 84 if (ACPI_FAILURE(status)) {
85 ACPI_REPORT_ERROR(("Could not transition to ACPI mode\n")); 85 ACPI_ERROR((AE_INFO,
86 "Could not transition to ACPI mode"));
86 return_ACPI_STATUS(status); 87 return_ACPI_STATUS(status);
87 } 88 }
88 89
@@ -112,7 +113,7 @@ acpi_status acpi_disable(void)
112 ACPI_FUNCTION_TRACE("acpi_disable"); 113 ACPI_FUNCTION_TRACE("acpi_disable");
113 114
114 if (!acpi_gbl_FADT) { 115 if (!acpi_gbl_FADT) {
115 ACPI_REPORT_WARNING(("No FADT information present!\n")); 116 ACPI_WARNING((AE_INFO, "No FADT information present!"));
116 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 117 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
117 } 118 }
118 119
@@ -125,7 +126,8 @@ acpi_status acpi_disable(void)
125 status = acpi_hw_set_mode(ACPI_SYS_MODE_LEGACY); 126 status = acpi_hw_set_mode(ACPI_SYS_MODE_LEGACY);
126 127
127 if (ACPI_FAILURE(status)) { 128 if (ACPI_FAILURE(status)) {
128 ACPI_REPORT_ERROR(("Could not exit ACPI mode to legacy mode")); 129 ACPI_ERROR((AE_INFO,
130 "Could not exit ACPI mode to legacy mode"));
129 return_ACPI_STATUS(status); 131 return_ACPI_STATUS(status);
130 } 132 }
131 133
@@ -182,8 +184,9 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
182 } 184 }
183 185
184 if (value != 1) { 186 if (value != 1) {
185 ACPI_REPORT_ERROR(("Could not enable %s event\n", 187 ACPI_ERROR((AE_INFO,
186 acpi_ut_get_event_name(event))); 188 "Could not enable %s event",
189 acpi_ut_get_event_name(event)));
187 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE); 190 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
188 } 191 }
189 192
@@ -380,8 +383,9 @@ acpi_status acpi_disable_event(u32 event, u32 flags)
380 } 383 }
381 384
382 if (value != 0) { 385 if (value != 0) {
383 ACPI_REPORT_ERROR(("Could not disable %s events\n", 386 ACPI_ERROR((AE_INFO,
384 acpi_ut_get_event_name(event))); 387 "Could not disable %s events",
388 acpi_ut_get_event_name(event)));
385 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE); 389 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
386 } 390 }
387 391