aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/parser/psloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/parser/psloop.c')
-rw-r--r--drivers/acpi/parser/psloop.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/acpi/parser/psloop.c b/drivers/acpi/parser/psloop.c
index c66029b890b1..00b072e15d19 100644
--- a/drivers/acpi/parser/psloop.c
+++ b/drivers/acpi/parser/psloop.c
@@ -123,10 +123,12 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
123 && ((status & AE_CODE_MASK) != 123 && ((status & AE_CODE_MASK) !=
124 AE_CODE_CONTROL)) { 124 AE_CODE_CONTROL)) {
125 if (status == AE_AML_NO_RETURN_VALUE) { 125 if (status == AE_AML_NO_RETURN_VALUE) {
126 ACPI_REPORT_ERROR(("Invoked method did not return a value, %s\n", acpi_format_exception(status))); 126 ACPI_EXCEPTION((AE_INFO, status,
127 "Invoked method did not return a value"));
127 128
128 } 129 }
129 ACPI_REPORT_ERROR(("get_predicate Failed, %s\n", acpi_format_exception(status))); 130 ACPI_EXCEPTION((AE_INFO, status,
131 "get_predicate Failed"));
130 return_ACPI_STATUS(status); 132 return_ACPI_STATUS(status);
131 } 133 }
132 134
@@ -184,7 +186,11 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
184 186
185 /* The opcode is unrecognized. Just skip unknown opcodes */ 187 /* The opcode is unrecognized. Just skip unknown opcodes */
186 188
187 ACPI_REPORT_ERROR(("Found unknown opcode %X at AML address %p offset %X, ignoring\n", walk_state->opcode, parser_state->aml, walk_state->aml_offset)); 189 ACPI_ERROR((AE_INFO,
190 "Found unknown opcode %X at AML address %p offset %X, ignoring",
191 walk_state->opcode,
192 parser_state->aml,
193 walk_state->aml_offset));
188 194
189 ACPI_DUMP_BUFFER(parser_state->aml, 128); 195 ACPI_DUMP_BUFFER(parser_state->aml, 128);
190 196
@@ -271,7 +277,8 @@ acpi_status acpi_ps_parse_loop(struct acpi_walk_state *walk_state)
271 walk_state->descending_callback(walk_state, 277 walk_state->descending_callback(walk_state,
272 &op); 278 &op);
273 if (ACPI_FAILURE(status)) { 279 if (ACPI_FAILURE(status)) {
274 ACPI_REPORT_ERROR(("During name lookup/catalog, %s\n", acpi_format_exception(status))); 280 ACPI_EXCEPTION((AE_INFO, status,
281 "During name lookup/catalog"));
275 goto close_this_op; 282 goto close_this_op;
276 } 283 }
277 284