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/hardware/hwregs.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/hardware/hwregs.c')
-rw-r--r-- | drivers/acpi/hardware/hwregs.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c index b243f20708b7..b4b50a3d1705 100644 --- a/drivers/acpi/hardware/hwregs.c +++ b/drivers/acpi/hardware/hwregs.c | |||
@@ -7,7 +7,7 @@ | |||
7 | ******************************************************************************/ | 7 | ******************************************************************************/ |
8 | 8 | ||
9 | /* | 9 | /* |
10 | * Copyright (C) 2000 - 2005, R. Byron Moore | 10 | * Copyright (C) 2000 - 2006, R. Byron Moore |
11 | * All rights reserved. | 11 | * All rights reserved. |
12 | * | 12 | * |
13 | * Redistribution and use in source and binary forms, with or without | 13 | * Redistribution and use in source and binary forms, with or without |
@@ -202,12 +202,7 @@ acpi_get_sleep_type_data(u8 sleep_state, u8 * sleep_type_a, u8 * sleep_type_b) | |||
202 | } | 202 | } |
203 | 203 | ||
204 | if (ACPI_FAILURE(status)) { | 204 | if (ACPI_FAILURE(status)) { |
205 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 205 | ACPI_REPORT_ERROR(("%s While evaluating sleep_state [%s], bad Sleep object %p type %s\n", acpi_format_exception(status), sleep_state_name, info.return_object, acpi_ut_get_object_type_name(info.return_object))); |
206 | "%s While evaluating sleep_state [%s], bad Sleep object %p type %s\n", | ||
207 | acpi_format_exception(status), | ||
208 | sleep_state_name, info.return_object, | ||
209 | acpi_ut_get_object_type_name(info. | ||
210 | return_object))); | ||
211 | } | 206 | } |
212 | 207 | ||
213 | acpi_ut_remove_reference(info.return_object); | 208 | acpi_ut_remove_reference(info.return_object); |
@@ -230,12 +225,11 @@ EXPORT_SYMBOL(acpi_get_sleep_type_data); | |||
230 | 225 | ||
231 | struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id) | 226 | struct acpi_bit_register_info *acpi_hw_get_bit_register_info(u32 register_id) |
232 | { | 227 | { |
233 | ACPI_FUNCTION_NAME("hw_get_bit_register_info"); | 228 | ACPI_FUNCTION_ENTRY(); |
234 | 229 | ||
235 | if (register_id > ACPI_BITREG_MAX) { | 230 | if (register_id > ACPI_BITREG_MAX) { |
236 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 231 | ACPI_REPORT_ERROR(("Invalid bit_register ID: %X\n", |
237 | "Invalid bit_register ID: %X\n", | 232 | register_id)); |
238 | register_id)); | ||
239 | return (NULL); | 233 | return (NULL); |
240 | } | 234 | } |
241 | 235 | ||
@@ -570,8 +564,7 @@ acpi_hw_register_read(u8 use_lock, u32 register_id, u32 * return_value) | |||
570 | break; | 564 | break; |
571 | 565 | ||
572 | default: | 566 | default: |
573 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unknown Register ID: %X\n", | 567 | ACPI_REPORT_ERROR(("Unknown Register ID: %X\n", register_id)); |
574 | register_id)); | ||
575 | status = AE_BAD_PARAMETER; | 568 | status = AE_BAD_PARAMETER; |
576 | break; | 569 | break; |
577 | } | 570 | } |
@@ -766,9 +759,8 @@ acpi_hw_low_level_read(u32 width, u32 * value, struct acpi_generic_address *reg) | |||
766 | break; | 759 | break; |
767 | 760 | ||
768 | default: | 761 | default: |
769 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 762 | ACPI_REPORT_ERROR(("Unsupported address space: %X\n", |
770 | "Unsupported address space: %X\n", | 763 | reg->address_space_id)); |
771 | reg->address_space_id)); | ||
772 | return (AE_BAD_PARAMETER); | 764 | return (AE_BAD_PARAMETER); |
773 | } | 765 | } |
774 | 766 | ||
@@ -837,9 +829,8 @@ acpi_hw_low_level_write(u32 width, u32 value, struct acpi_generic_address * reg) | |||
837 | break; | 829 | break; |
838 | 830 | ||
839 | default: | 831 | default: |
840 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 832 | ACPI_REPORT_ERROR(("Unsupported address space: %X\n", |
841 | "Unsupported address space: %X\n", | 833 | reg->address_space_id)); |
842 | reg->address_space_id)); | ||
843 | return (AE_BAD_PARAMETER); | 834 | return (AE_BAD_PARAMETER); |
844 | } | 835 | } |
845 | 836 | ||