aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/utilities/uteval.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/utilities/uteval.c')
-rw-r--r--drivers/acpi/utilities/uteval.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c
index f4dc374a0eec..106cc97cb4af 100644
--- a/drivers/acpi/utilities/uteval.c
+++ b/drivers/acpi/utilities/uteval.c
@@ -154,8 +154,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
154 acpi_ut_get_node_name(prefix_node), 154 acpi_ut_get_node_name(prefix_node),
155 path)); 155 path));
156 } else { 156 } else {
157 ACPI_REPORT_MTERROR("Method execution failed", 157 ACPI_ERROR_METHOD("Method execution failed",
158 prefix_node, path, status); 158 prefix_node, path, status);
159 } 159 }
160 160
161 return_ACPI_STATUS(status); 161 return_ACPI_STATUS(status);
@@ -165,8 +165,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
165 165
166 if (!info.return_object) { 166 if (!info.return_object) {
167 if (expected_return_btypes) { 167 if (expected_return_btypes) {
168 ACPI_REPORT_MTERROR("No object was returned from", 168 ACPI_ERROR_METHOD("No object was returned from",
169 prefix_node, path, AE_NOT_EXIST); 169 prefix_node, path, AE_NOT_EXIST);
170 170
171 return_ACPI_STATUS(AE_NOT_EXIST); 171 return_ACPI_STATUS(AE_NOT_EXIST);
172 } 172 }
@@ -211,10 +211,14 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
211 /* Is the return object one of the expected types? */ 211 /* Is the return object one of the expected types? */
212 212
213 if (!(expected_return_btypes & return_btype)) { 213 if (!(expected_return_btypes & return_btype)) {
214 ACPI_REPORT_MTERROR("Return object type is incorrect", 214 ACPI_ERROR_METHOD("Return object type is incorrect",
215 prefix_node, path, AE_TYPE); 215 prefix_node, path, AE_TYPE);
216 216
217 ACPI_REPORT_ERROR(("Type returned from %s was incorrect: %s, expected Btypes: %X\n", path, acpi_ut_get_object_type_name(info.return_object), expected_return_btypes)); 217 ACPI_ERROR((AE_INFO,
218 "Type returned from %s was incorrect: %s, expected Btypes: %X",
219 path,
220 acpi_ut_get_object_type_name(info.return_object),
221 expected_return_btypes));
218 222
219 /* On error exit, we must delete the return object */ 223 /* On error exit, we must delete the return object */
220 224