diff options
author | Bob Moore <robert.moore@intel.com> | 2006-01-13 16:22:00 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-01-20 02:23:50 -0500 |
commit | 4a90c7e86202f46fa9af011bdbcdf36e355d1721 (patch) | |
tree | 3784cffb2166330d6f94ea53996fbeef36f58ce3 /drivers/acpi/events/evxfevnt.c | |
parent | 3c5c363826e435cf4d54d917202567e5b57cae5f (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/evxfevnt.c')
-rw-r--r-- | drivers/acpi/events/evxfevnt.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c index c1b89892825..90eb7939e98 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 | ||