git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
dispatcher
/
dsutils.c
diff --git
a/drivers/acpi/dispatcher/dsutils.c
b/drivers/acpi/dispatcher/dsutils.c
index cd9aa7faa57b2680923b86e44c7540fcf3f153d1..53356a591ac19da2e7881fc81c0d9431920318b2 100644
(file)
--- a/
drivers/acpi/dispatcher/dsutils.c
+++ b/
drivers/acpi/dispatcher/dsutils.c
@@
-176,7
+176,7
@@
acpi_ds_is_result_used(union acpi_parse_object * op,
/* Must have both an Op and a Result Object */
if (!op) {
/* Must have both an Op and a Result Object */
if (!op) {
- ACPI_
REPORT_ERROR(("Null Op\n
"));
+ ACPI_
ERROR((AE_INFO, "Null Op
"));
return_UINT8(TRUE);
}
return_UINT8(TRUE);
}
@@
-216,7
+216,7
@@
acpi_ds_is_result_used(union acpi_parse_object * op,
parent_info =
acpi_ps_get_opcode_info(op->common.parent->common.aml_opcode);
if (parent_info->class == AML_CLASS_UNKNOWN) {
parent_info =
acpi_ps_get_opcode_info(op->common.parent->common.aml_opcode);
if (parent_info->class == AML_CLASS_UNKNOWN) {
- ACPI_
REPORT_ERROR(("Unknown parent opcode Op=%p\n
", op));
+ ACPI_
ERROR((AE_INFO, "Unknown parent opcode Op=%p
", op));
return_UINT8(FALSE);
}
return_UINT8(FALSE);
}
@@
-343,7
+343,7
@@
acpi_ds_delete_result_if_not_used(union acpi_parse_object *op,
ACPI_FUNCTION_TRACE_PTR("ds_delete_result_if_not_used", result_obj);
if (!op) {
ACPI_FUNCTION_TRACE_PTR("ds_delete_result_if_not_used", result_obj);
if (!op) {
- ACPI_
REPORT_ERROR(("Null Op\n
"));
+ ACPI_
ERROR((AE_INFO, "Null Op
"));
return_VOID;
}
return_VOID;
}
@@
-566,7
+566,7
@@
acpi_ds_create_operand(struct acpi_walk_state *walk_state,
}
if (ACPI_FAILURE(status)) {
}
if (ACPI_FAILURE(status)) {
- ACPI_
REPORT_NSERROR
(name_string, status);
+ ACPI_
ERROR_NAMESPACE
(name_string, status);
}
}
}
}
@@
-634,7
+634,8
@@
acpi_ds_create_operand(struct acpi_walk_state *walk_state,
* Only error is underflow, and this indicates
* a missing or null operand!
*/
* Only error is underflow, and this indicates
* a missing or null operand!
*/
- ACPI_REPORT_ERROR(("Missing or null operand, %s\n", acpi_format_exception(status)));
+ ACPI_EXCEPTION((AE_INFO, status,
+ "Missing or null operand"));
return_ACPI_STATUS(status);
}
} else {
return_ACPI_STATUS(status);
}
} else {
@@
-726,7
+727,7
@@
acpi_ds_create_operands(struct acpi_walk_state *walk_state,
*/
(void)acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state);
*/
(void)acpi_ds_obj_stack_pop_and_delete(arg_count, walk_state);
- ACPI_
REPORT_ERROR(("While creating Arg %d - %s\n
",
-
(arg_count + 1), acpi_format_exception(status
)));
+ ACPI_
EXCEPTION((AE_INFO, status, "While creating Arg %d
",
+
(arg_count + 1
)));
return_ACPI_STATUS(status);
}
return_ACPI_STATUS(status);
}