diff options
Diffstat (limited to 'drivers/acpi/namespace/nsxfeval.c')
-rw-r--r-- | drivers/acpi/namespace/nsxfeval.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c index 75b137a6a3c9..de13add43efc 100644 --- a/drivers/acpi/namespace/nsxfeval.c +++ b/drivers/acpi/namespace/nsxfeval.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 |
@@ -112,8 +112,7 @@ acpi_evaluate_object_typed(acpi_handle handle, | |||
112 | if (return_buffer->length == 0) { | 112 | if (return_buffer->length == 0) { |
113 | /* Error because caller specifically asked for a return value */ | 113 | /* Error because caller specifically asked for a return value */ |
114 | 114 | ||
115 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No return value\n")); | 115 | ACPI_REPORT_ERROR(("No return value\n")); |
116 | |||
117 | return_ACPI_STATUS(AE_NULL_OBJECT); | 116 | return_ACPI_STATUS(AE_NULL_OBJECT); |
118 | } | 117 | } |
119 | 118 | ||
@@ -125,11 +124,11 @@ acpi_evaluate_object_typed(acpi_handle handle, | |||
125 | 124 | ||
126 | /* Return object type does not match requested type */ | 125 | /* Return object type does not match requested type */ |
127 | 126 | ||
128 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 127 | ACPI_REPORT_ERROR(("Incorrect return type [%s] requested [%s]\n", |
129 | "Incorrect return type [%s] requested [%s]\n", | 128 | acpi_ut_get_type_name(((union acpi_object *) |
130 | acpi_ut_get_type_name(((union acpi_object *) | 129 | return_buffer->pointer)-> |
131 | return_buffer->pointer)->type), | 130 | type), |
132 | acpi_ut_get_type_name(return_type))); | 131 | acpi_ut_get_type_name(return_type))); |
133 | 132 | ||
134 | if (must_free) { | 133 | if (must_free) { |
135 | /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */ | 134 | /* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */ |
@@ -236,11 +235,9 @@ acpi_evaluate_object(acpi_handle handle, | |||
236 | * qualified names above, this is an error | 235 | * qualified names above, this is an error |
237 | */ | 236 | */ |
238 | if (!pathname) { | 237 | if (!pathname) { |
239 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 238 | ACPI_REPORT_ERROR(("Both Handle and Pathname are NULL\n")); |
240 | "Both Handle and Pathname are NULL\n")); | ||
241 | } else { | 239 | } else { |
242 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 240 | ACPI_REPORT_ERROR(("Handle is NULL and Pathname is relative\n")); |
243 | "Handle is NULL and Pathname is relative\n")); | ||
244 | } | 241 | } |
245 | 242 | ||
246 | status = AE_BAD_PARAMETER; | 243 | status = AE_BAD_PARAMETER; |