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/namespace/nsobject.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/namespace/nsobject.c')
-rw-r--r-- | drivers/acpi/namespace/nsobject.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/namespace/nsobject.c b/drivers/acpi/namespace/nsobject.c index fc9be946ebe..86113093f7b 100644 --- a/drivers/acpi/namespace/nsobject.c +++ b/drivers/acpi/namespace/nsobject.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 |
@@ -84,21 +84,21 @@ acpi_ns_attach_object(struct acpi_namespace_node *node, | |||
84 | if (!node) { | 84 | if (!node) { |
85 | /* Invalid handle */ | 85 | /* Invalid handle */ |
86 | 86 | ||
87 | ACPI_REPORT_ERROR(("ns_attach_object: Null named_obj handle\n")); | 87 | ACPI_REPORT_ERROR(("Null named_obj handle\n")); |
88 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 88 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
89 | } | 89 | } |
90 | 90 | ||
91 | if (!object && (ACPI_TYPE_ANY != type)) { | 91 | if (!object && (ACPI_TYPE_ANY != type)) { |
92 | /* Null object */ | 92 | /* Null object */ |
93 | 93 | ||
94 | ACPI_REPORT_ERROR(("ns_attach_object: Null object, but type not ACPI_TYPE_ANY\n")); | 94 | ACPI_REPORT_ERROR(("Null object, but type not ACPI_TYPE_ANY\n")); |
95 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 95 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
96 | } | 96 | } |
97 | 97 | ||
98 | if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) { | 98 | if (ACPI_GET_DESCRIPTOR_TYPE(node) != ACPI_DESC_TYPE_NAMED) { |
99 | /* Not a name handle */ | 99 | /* Not a name handle */ |
100 | 100 | ||
101 | ACPI_REPORT_ERROR(("ns_attach_object: Invalid handle %p [%s]\n", | 101 | ACPI_REPORT_ERROR(("Invalid handle %p [%s]\n", |
102 | node, acpi_ut_get_descriptor_name(node))); | 102 | node, acpi_ut_get_descriptor_name(node))); |
103 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 103 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
104 | } | 104 | } |
@@ -254,7 +254,7 @@ union acpi_operand_object *acpi_ns_get_attached_object(struct | |||
254 | ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node); | 254 | ACPI_FUNCTION_TRACE_PTR("ns_get_attached_object", node); |
255 | 255 | ||
256 | if (!node) { | 256 | if (!node) { |
257 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Null Node ptr\n")); | 257 | ACPI_REPORT_WARNING(("Null Node ptr\n")); |
258 | return_PTR(NULL); | 258 | return_PTR(NULL); |
259 | } | 259 | } |
260 | 260 | ||