projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
[powerpc.git]
/
drivers
/
acpi
/
dispatcher
/
dsutils.c
diff --git
a/drivers/acpi/dispatcher/dsutils.c
b/drivers/acpi/dispatcher/dsutils.c
index
83ae1c1
..
53356a5
100644
(file)
--- a/
drivers/acpi/dispatcher/dsutils.c
+++ b/
drivers/acpi/dispatcher/dsutils.c
@@
-5,7
+5,7
@@
******************************************************************************/
/*
******************************************************************************/
/*
- * Copyright (C) 2000 - 200
5
, R. Byron Moore
+ * Copyright (C) 2000 - 200
6
, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-176,8
+176,8
@@
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_
DEBUG_PRINT((ACPI_DB_ERROR, "Null Op\n
"));
- return_
VALUE
(TRUE);
+ ACPI_
ERROR((AE_INFO, "Null Op
"));
+ return_
UINT8
(TRUE);
}
/*
}
/*
@@
-208,7
+208,7
@@
acpi_ds_is_result_used(union acpi_parse_object * op,
"At Method level, result of [%s] not used\n",
acpi_ps_get_opcode_name(op->common.
aml_opcode)));
"At Method level, result of [%s] not used\n",
acpi_ps_get_opcode_name(op->common.
aml_opcode)));
- return_
VALUE
(FALSE);
+ return_
UINT8
(FALSE);
}
/* Get info on the parent. The root_op is AML_SCOPE */
}
/* Get info on the parent. The root_op is AML_SCOPE */
@@
-216,9
+216,8
@@
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_DEBUG_PRINT((ACPI_DB_ERROR,
- "Unknown parent opcode. Op=%p\n", op));
- return_VALUE(FALSE);
+ ACPI_ERROR((AE_INFO, "Unknown parent opcode Op=%p", op));
+ return_UINT8(FALSE);
}
/*
}
/*
@@
-304,7
+303,7
@@
acpi_ds_is_result_used(union acpi_parse_object * op,
acpi_ps_get_opcode_name(op->common.parent->common.
aml_opcode), op));
acpi_ps_get_opcode_name(op->common.parent->common.
aml_opcode), op));
- return_
VALUE
(TRUE);
+ return_
UINT8
(TRUE);
result_not_used:
ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
result_not_used:
ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
@@
-313,7
+312,7
@@
acpi_ds_is_result_used(union acpi_parse_object * op,
acpi_ps_get_opcode_name(op->common.parent->common.
aml_opcode), op));
acpi_ps_get_opcode_name(op->common.parent->common.
aml_opcode), op));
- return_
VALUE
(FALSE);
+ return_
UINT8
(FALSE);
}
/*******************************************************************************
}
/*******************************************************************************
@@
-344,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_
DEBUG_PRINT((ACPI_DB_ERROR, "Null Op\n
"));
+ ACPI_
ERROR((AE_INFO, "Null Op
"));
return_VOID;
}
return_VOID;
}
@@
-567,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);
}
}
}
}
@@
-616,7
+615,7
@@
acpi_ds_create_operand(struct acpi_walk_state *walk_state,
if (op_info->flags & AML_HAS_RETVAL) {
ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
if (op_info->flags & AML_HAS_RETVAL) {
ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
- "Argument previously created, already stacked
\n"));
+ "Argument previously created, already stacked\n"));
ACPI_DEBUGGER_EXEC(acpi_db_display_argument_object
(walk_state->
ACPI_DEBUGGER_EXEC(acpi_db_display_argument_object
(walk_state->
@@
-635,10
+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_DEBUG_PRINT((ACPI_DB_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 {
@@
-730,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_
DEBUG_PRINT((ACPI_DB_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);
}