aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/events
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2006-01-13 16:22:00 -0500
committerLen Brown <len.brown@intel.com>2006-01-20 02:23:50 -0500
commit4a90c7e86202f46fa9af011bdbcdf36e355d1721 (patch)
tree3784cffb2166330d6f94ea53996fbeef36f58ce3 /drivers/acpi/events
parent3c5c363826e435cf4d54d917202567e5b57cae5f (diff)
[ACPI] ACPICA 20060113
Added 2006 copyright. At SuSE's suggestion, enabled all error messages without enabling function tracing, ie with CONFIG_ACPI_DEBUG=n Replaced all instances of the ACPI_DEBUG_PRINT macro invoked at the ACPI_DB_ERROR and ACPI_DB_WARN debug levels with the ACPI_REPORT_ERROR and ACPI_REPORT_WARNING macros, respectively. This preserves all error and warning messages in the non-debug version of the ACPICA code (this has been referred to as the "debug lite" option.) Over 200 cases were converted to create a total of over 380 error/warning messages across the ACPICA code. This increases the code and data size of the default non-debug version by about 13K. Added ACPI_NO_ERROR_MESSAGES flag to enable deleting all messages. The size of the debug version remains about the same. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/events')
-rw-r--r--drivers/acpi/events/evevent.c4
-rw-r--r--drivers/acpi/events/evgpe.c20
-rw-r--r--drivers/acpi/events/evgpeblk.c20
-rw-r--r--drivers/acpi/events/evmisc.c12
-rw-r--r--drivers/acpi/events/evregion.c45
-rw-r--r--drivers/acpi/events/evrgnini.c2
-rw-r--r--drivers/acpi/events/evsci.c2
-rw-r--r--drivers/acpi/events/evxface.c13
-rw-r--r--drivers/acpi/events/evxfevnt.c23
-rw-r--r--drivers/acpi/events/evxfregn.c2
10 files changed, 57 insertions, 86 deletions
diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index 9522c643b88b..b380ae1044b7 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.c
@@ -5,7 +5,7 @@
5 *****************************************************************************/ 5 *****************************************************************************/
6 6
7/* 7/*
8 * Copyright (C) 2000 - 2005, R. Byron Moore 8 * Copyright (C) 2000 - 2006, R. Byron Moore
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
@@ -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_DEBUG_PRINT((ACPI_DB_WARN, "No ACPI tables present!\n")); 76 ACPI_REPORT_WARNING(("No ACPI tables present!\n"));
77 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 77 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
78 } 78 }
79 79
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index bdd86537738e..353b907edbfa 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -5,7 +5,7 @@
5 *****************************************************************************/ 5 *****************************************************************************/
6 6
7/* 7/*
8 * Copyright (C) 2000 - 2005, R. Byron Moore 8 * Copyright (C) 2000 - 2006, R. Byron Moore
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
@@ -599,7 +599,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
599 ACPI_GPE_EDGE_TRIGGERED) { 599 ACPI_GPE_EDGE_TRIGGERED) {
600 status = acpi_hw_clear_gpe(gpe_event_info); 600 status = acpi_hw_clear_gpe(gpe_event_info);
601 if (ACPI_FAILURE(status)) { 601 if (ACPI_FAILURE(status)) {
602 ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number)); 602 ACPI_REPORT_ERROR(("%s, Unable to clear GPE[%2X]\n",
603 acpi_format_exception(status),
604 gpe_number));
603 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); 605 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
604 } 606 }
605 } 607 }
@@ -637,7 +639,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
637 ACPI_GPE_LEVEL_TRIGGERED) { 639 ACPI_GPE_LEVEL_TRIGGERED) {
638 status = acpi_hw_clear_gpe(gpe_event_info); 640 status = acpi_hw_clear_gpe(gpe_event_info);
639 if (ACPI_FAILURE(status)) { 641 if (ACPI_FAILURE(status)) {
640 ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number)); 642 ACPI_REPORT_ERROR(("%s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number));
641 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); 643 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
642 } 644 }
643 } 645 }
@@ -651,7 +653,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
651 */ 653 */
652 status = acpi_ev_disable_gpe(gpe_event_info); 654 status = acpi_ev_disable_gpe(gpe_event_info);
653 if (ACPI_FAILURE(status)) { 655 if (ACPI_FAILURE(status)) {
654 ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to disable GPE[%2X]\n", acpi_format_exception(status), gpe_number)); 656 ACPI_REPORT_ERROR(("%s, Unable to disable GPE[%2X]\n",
657 acpi_format_exception(status),
658 gpe_number));
655 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); 659 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
656 } 660 }
657 661
@@ -663,7 +667,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
663 acpi_ev_asynch_execute_gpe_method, 667 acpi_ev_asynch_execute_gpe_method,
664 gpe_event_info); 668 gpe_event_info);
665 if (ACPI_FAILURE(status)) { 669 if (ACPI_FAILURE(status)) {
666 ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to queue handler for GPE[%2X] - event disabled\n", acpi_format_exception(status), gpe_number)); 670 ACPI_REPORT_ERROR(("%s, Unable to queue handler for GPE[%2X] - event disabled\n", acpi_format_exception(status), gpe_number));
667 } 671 }
668 break; 672 break;
669 673
@@ -671,7 +675,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
671 675
672 /* No handler or method to run! */ 676 /* No handler or method to run! */
673 677
674 ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: No handler or method for GPE[%2X], disabling event\n", gpe_number)); 678 ACPI_REPORT_ERROR(("No handler or method for GPE[%2X], disabling event\n", gpe_number));
675 679
676 /* 680 /*
677 * Disable the GPE. The GPE will remain disabled until the ACPI 681 * Disable the GPE. The GPE will remain disabled until the ACPI
@@ -679,7 +683,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
679 */ 683 */
680 status = acpi_ev_disable_gpe(gpe_event_info); 684 status = acpi_ev_disable_gpe(gpe_event_info);
681 if (ACPI_FAILURE(status)) { 685 if (ACPI_FAILURE(status)) {
682 ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to disable GPE[%2X]\n", acpi_format_exception(status), gpe_number)); 686 ACPI_REPORT_ERROR(("%s, Unable to disable GPE[%2X]\n",
687 acpi_format_exception(status),
688 gpe_number));
683 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED); 689 return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
684 } 690 }
685 break; 691 break;
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index 8efca2eac27e..3b9bbdda551d 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -5,7 +5,7 @@
5 *****************************************************************************/ 5 *****************************************************************************/
6 6
7/* 7/*
8 * Copyright (C) 2000 - 2005, R. Byron Moore 8 * Copyright (C) 2000 - 2006, R. Byron Moore
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
@@ -279,9 +279,7 @@ 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_DEBUG_PRINT((ACPI_DB_ERROR, 282 ACPI_REPORT_ERROR(("Unknown GPE method type: %s (name not of form _Lxx or _Exx)\n", name));
283 "Unknown GPE method type: %s (name not of form _Lxx or _Exx)\n",
284 name));
285 return_ACPI_STATUS(AE_OK); 283 return_ACPI_STATUS(AE_OK);
286 } 284 }
287 285
@@ -291,9 +289,7 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
291 if (gpe_number == ACPI_UINT32_MAX) { 289 if (gpe_number == ACPI_UINT32_MAX) {
292 /* Conversion failed; invalid method, just ignore it */ 290 /* Conversion failed; invalid method, just ignore it */
293 291
294 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 292 ACPI_REPORT_ERROR(("Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)\n", name));
295 "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)\n",
296 name));
297 return_ACPI_STATUS(AE_OK); 293 return_ACPI_STATUS(AE_OK);
298 } 294 }
299 295
@@ -527,9 +523,7 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
527 acpi_ev_gpe_xrupt_handler, 523 acpi_ev_gpe_xrupt_handler,
528 gpe_xrupt); 524 gpe_xrupt);
529 if (ACPI_FAILURE(status)) { 525 if (ACPI_FAILURE(status)) {
530 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 526 ACPI_REPORT_ERROR(("Could not install GPE interrupt handler at level 0x%X\n", interrupt_number));
531 "Could not install GPE interrupt handler at level 0x%X\n",
532 interrupt_number));
533 return_PTR(NULL); 527 return_PTR(NULL);
534 } 528 }
535 } 529 }
@@ -745,8 +739,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
745 sizeof(struct 739 sizeof(struct
746 acpi_gpe_register_info)); 740 acpi_gpe_register_info));
747 if (!gpe_register_info) { 741 if (!gpe_register_info) {
748 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 742 ACPI_REPORT_ERROR(("Could not allocate the gpe_register_info table\n"));
749 "Could not allocate the gpe_register_info table\n"));
750 return_ACPI_STATUS(AE_NO_MEMORY); 743 return_ACPI_STATUS(AE_NO_MEMORY);
751 } 744 }
752 745
@@ -759,8 +752,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
759 ACPI_GPE_REGISTER_WIDTH) * 752 ACPI_GPE_REGISTER_WIDTH) *
760 sizeof(struct acpi_gpe_event_info)); 753 sizeof(struct acpi_gpe_event_info));
761 if (!gpe_event_info) { 754 if (!gpe_event_info) {
762 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 755 ACPI_REPORT_ERROR(("Could not allocate the gpe_event_info table\n"));
763 "Could not allocate the gpe_event_info table\n"));
764 status = AE_NO_MEMORY; 756 status = AE_NO_MEMORY;
765 goto error_exit; 757 goto error_exit;
766 } 758 }
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index 7e57b8470f55..78883239784a 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -5,7 +5,7 @@
5 *****************************************************************************/ 5 *****************************************************************************/
6 6
7/* 7/*
8 * Copyright (C) 2000 - 2005, R. Byron Moore 8 * Copyright (C) 2000 - 2006, R. Byron Moore
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
@@ -542,9 +542,7 @@ void acpi_ev_terminate(void)
542 for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) { 542 for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
543 status = acpi_disable_event((u32) i, 0); 543 status = acpi_disable_event((u32) i, 0);
544 if (ACPI_FAILURE(status)) { 544 if (ACPI_FAILURE(status)) {
545 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 545 ACPI_REPORT_ERROR(("Could not disable fixed event %d\n", (u32) i));
546 "Could not disable fixed event %d\n",
547 (u32) i));
548 } 546 }
549 } 547 }
550 548
@@ -556,8 +554,7 @@ void acpi_ev_terminate(void)
556 554
557 status = acpi_ev_remove_sci_handler(); 555 status = acpi_ev_remove_sci_handler();
558 if (ACPI_FAILURE(status)) { 556 if (ACPI_FAILURE(status)) {
559 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 557 ACPI_REPORT_ERROR(("Could not remove SCI handler\n"));
560 "Could not remove SCI handler\n"));
561 } 558 }
562 } 559 }
563 560
@@ -570,8 +567,7 @@ void acpi_ev_terminate(void)
570 if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) { 567 if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) {
571 status = acpi_disable(); 568 status = acpi_disable();
572 if (ACPI_FAILURE(status)) { 569 if (ACPI_FAILURE(status)) {
573 ACPI_DEBUG_PRINT((ACPI_DB_WARN, 570 ACPI_REPORT_WARNING(("acpi_disable failed\n"));
574 "acpi_disable failed\n"));
575 } 571 }
576 } 572 }
577 return_VOID; 573 return_VOID;
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 84fad082d80d..900e5b32e595 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -5,7 +5,7 @@
5 *****************************************************************************/ 5 *****************************************************************************/
6 6
7/* 7/*
8 * Copyright (C) 2000 - 2005, R. Byron Moore 8 * Copyright (C) 2000 - 2006, R. Byron Moore
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
@@ -295,12 +295,11 @@ 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_DEBUG_PRINT((ACPI_DB_ERROR, 298 ACPI_REPORT_ERROR(("No handler for Region [%4.4s] (%p) [%s]\n",
299 "No handler for Region [%4.4s] (%p) [%s]\n", 299 acpi_ut_get_node_name(region_obj->region.
300 acpi_ut_get_node_name(region_obj->region. 300 node), region_obj,
301 node), region_obj, 301 acpi_ut_get_region_name(region_obj->region.
302 acpi_ut_get_region_name(region_obj->region. 302 space_id)));
303 space_id)));
304 303
305 return_ACPI_STATUS(AE_NOT_EXIST); 304 return_ACPI_STATUS(AE_NOT_EXIST);
306 } 305 }
@@ -317,12 +316,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
317 if (!region_setup) { 316 if (!region_setup) {
318 /* No initialization routine, exit with error */ 317 /* No initialization routine, exit with error */
319 318
320 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 319 ACPI_REPORT_ERROR(("No init routine for region(%p) [%s]\n", region_obj, acpi_ut_get_region_name(region_obj->region.space_id)));
321 "No init routine for region(%p) [%s]\n",
322 region_obj,
323 acpi_ut_get_region_name(region_obj->
324 region.
325 space_id)));
326 return_ACPI_STATUS(AE_NOT_EXIST); 320 return_ACPI_STATUS(AE_NOT_EXIST);
327 } 321 }
328 322
@@ -347,12 +341,11 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
347 /* Check for failure of the Region Setup */ 341 /* Check for failure of the Region Setup */
348 342
349 if (ACPI_FAILURE(status)) { 343 if (ACPI_FAILURE(status)) {
350 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 344 ACPI_REPORT_ERROR(("Region Initialization: %s [%s]\n",
351 "Region Init: %s [%s]\n", 345 acpi_format_exception(status),
352 acpi_format_exception(status), 346 acpi_ut_get_region_name(region_obj->
353 acpi_ut_get_region_name(region_obj-> 347 region.
354 region. 348 space_id)));
355 space_id)));
356 return_ACPI_STATUS(status); 349 return_ACPI_STATUS(status);
357 } 350 }
358 351
@@ -501,12 +494,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
501 494
502 status = acpi_ev_execute_reg_method(region_obj, 0); 495 status = acpi_ev_execute_reg_method(region_obj, 0);
503 if (ACPI_FAILURE(status)) { 496 if (ACPI_FAILURE(status)) {
504 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 497 ACPI_REPORT_ERROR(("%s from region _REG, [%s]\n", acpi_format_exception(status), acpi_ut_get_region_name(region_obj->region.space_id)));
505 "%s from region _REG, [%s]\n",
506 acpi_format_exception(status),
507 acpi_ut_get_region_name
508 (region_obj->region.
509 space_id)));
510 } 498 }
511 499
512 if (acpi_ns_is_locked) { 500 if (acpi_ns_is_locked) {
@@ -528,12 +516,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
528 /* Init routine may fail, Just ignore errors */ 516 /* Init routine may fail, Just ignore errors */
529 517
530 if (ACPI_FAILURE(status)) { 518 if (ACPI_FAILURE(status)) {
531 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 519 ACPI_REPORT_ERROR(("%s from region init, [%s]\n", acpi_format_exception(status), acpi_ut_get_region_name(region_obj->region.space_id)));
532 "%s from region init, [%s]\n",
533 acpi_format_exception(status),
534 acpi_ut_get_region_name
535 (region_obj->region.
536 space_id)));
537 } 520 }
538 521
539 region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE); 522 region_obj->region.flags &= ~(AOPOBJ_SETUP_COMPLETE);
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index a1bd2da27c45..de1a38e9ce22 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -5,7 +5,7 @@
5 *****************************************************************************/ 5 *****************************************************************************/
6 6
7/* 7/*
8 * Copyright (C) 2000 - 2005, R. Byron Moore 8 * Copyright (C) 2000 - 2006, R. Byron Moore
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/events/evsci.c b/drivers/acpi/events/evsci.c
index e2c0b48a7e9f..9a622169008a 100644
--- a/drivers/acpi/events/evsci.c
+++ b/drivers/acpi/events/evsci.c
@@ -6,7 +6,7 @@
6 ******************************************************************************/ 6 ******************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index 57d73299298e..b2f69b1ac4b5 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -5,7 +5,7 @@
5 *****************************************************************************/ 5 *****************************************************************************/
6 6
7/* 7/*
8 * Copyright (C) 2000 - 2005, R. Byron Moore 8 * Copyright (C) 2000 - 2006, R. Byron Moore
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
@@ -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_DEBUG_PRINT((ACPI_DB_WARN, 146 ACPI_REPORT_WARNING(("Could not enable fixed event %X\n",
147 "Could not enable fixed event.\n")); 147 event));
148 148
149 /* Remove the handler */ 149 /* Remove the handler */
150 150
@@ -204,10 +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_DEBUG_PRINT((ACPI_DB_WARN, 207 ACPI_REPORT_WARNING(("Could not write to fixed event enable register %X\n", event));
208 "Could not write to fixed event enable register.\n"));
209 } else { 208 } else {
210 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X.\n", 209 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X\n",
211 event)); 210 event));
212 } 211 }
213 212
@@ -434,7 +433,7 @@ acpi_remove_notify_handler(acpi_handle device,
434 433
435 if (device == ACPI_ROOT_OBJECT) { 434 if (device == ACPI_ROOT_OBJECT) {
436 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 435 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
437 "Removing notify handler for ROOT object.\n")); 436 "Removing notify handler for namespace root object\n"));
438 437
439 if (((handler_type & ACPI_SYSTEM_NOTIFY) && 438 if (((handler_type & ACPI_SYSTEM_NOTIFY) &&
440 !acpi_gbl_system_notify.handler) || 439 !acpi_gbl_system_notify.handler) ||
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index c1b898928256..90eb7939e986 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.c
@@ -5,7 +5,7 @@
5 *****************************************************************************/ 5 *****************************************************************************/
6 6
7/* 7/*
8 * Copyright (C) 2000 - 2005, R. Byron Moore 8 * Copyright (C) 2000 - 2006, R. Byron Moore
9 * All rights reserved. 9 * All rights reserved.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
@@ -70,8 +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_DEBUG_PRINT((ACPI_DB_WARN, 73 ACPI_REPORT_WARNING(("No FADT information present!\n"));
74 "No FADT information present!\n"));
75 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 74 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
76 } 75 }
77 76
@@ -83,7 +82,7 @@ acpi_status acpi_enable(void)
83 82
84 status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI); 83 status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI);
85 if (ACPI_FAILURE(status)) { 84 if (ACPI_FAILURE(status)) {
86 ACPI_REPORT_ERROR(("Could not transition to ACPI mode.\n")); 85 ACPI_REPORT_ERROR(("Could not transition to ACPI mode\n"));
87 return_ACPI_STATUS(status); 86 return_ACPI_STATUS(status);
88 } 87 }
89 88
@@ -113,8 +112,7 @@ acpi_status acpi_disable(void)
113 ACPI_FUNCTION_TRACE("acpi_disable"); 112 ACPI_FUNCTION_TRACE("acpi_disable");
114 113
115 if (!acpi_gbl_FADT) { 114 if (!acpi_gbl_FADT) {
116 ACPI_DEBUG_PRINT((ACPI_DB_WARN, 115 ACPI_REPORT_WARNING(("No FADT information present!\n"));
117 "No FADT information present!\n"));
118 return_ACPI_STATUS(AE_NO_ACPI_TABLES); 116 return_ACPI_STATUS(AE_NO_ACPI_TABLES);
119 } 117 }
120 118
@@ -127,8 +125,7 @@ acpi_status acpi_disable(void)
127 status = acpi_hw_set_mode(ACPI_SYS_MODE_LEGACY); 125 status = acpi_hw_set_mode(ACPI_SYS_MODE_LEGACY);
128 126
129 if (ACPI_FAILURE(status)) { 127 if (ACPI_FAILURE(status)) {
130 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 128 ACPI_REPORT_ERROR(("Could not exit ACPI mode to legacy mode"));
131 "Could not exit ACPI mode to legacy mode"));
132 return_ACPI_STATUS(status); 129 return_ACPI_STATUS(status);
133 } 130 }
134 131
@@ -185,9 +182,8 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
185 } 182 }
186 183
187 if (value != 1) { 184 if (value != 1) {
188 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 185 ACPI_REPORT_ERROR(("Could not enable %s event\n",
189 "Could not enable %s event\n", 186 acpi_ut_get_event_name(event)));
190 acpi_ut_get_event_name(event)));
191 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE); 187 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
192 } 188 }
193 189
@@ -384,9 +380,8 @@ acpi_status acpi_disable_event(u32 event, u32 flags)
384 } 380 }
385 381
386 if (value != 0) { 382 if (value != 0) {
387 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 383 ACPI_REPORT_ERROR(("Could not disable %s events\n",
388 "Could not disable %s events\n", 384 acpi_ut_get_event_name(event)));
389 acpi_ut_get_event_name(event)));
390 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE); 385 return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
391 } 386 }
392 387
diff --git a/drivers/acpi/events/evxfregn.c b/drivers/acpi/events/evxfregn.c
index 6f28ea2db5ba..abf5caca9ae5 100644
--- a/drivers/acpi/events/evxfregn.c
+++ b/drivers/acpi/events/evxfregn.c
@@ -6,7 +6,7 @@
6 *****************************************************************************/ 6 *****************************************************************************/
7 7
8/* 8/*
9 * Copyright (C) 2000 - 2005, R. Byron Moore 9 * Copyright (C) 2000 - 2006, R. Byron Moore
10 * All rights reserved. 10 * All rights reserved.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-05 18:48:00 -0400