git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
acpi
/
dispatcher
/
dsobject.c
diff --git
a/drivers/acpi/dispatcher/dsobject.c
b/drivers/acpi/dispatcher/dsobject.c
index
72190ab
..
8b21f0f
100644
(file)
--- a/
drivers/acpi/dispatcher/dsobject.c
+++ b/
drivers/acpi/dispatcher/dsobject.c
@@
-81,7
+81,7
@@
acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
union acpi_operand_object *obj_desc;
acpi_status status;
union acpi_operand_object *obj_desc;
acpi_status status;
- ACPI_FUNCTION_TRACE(
ds_build_internal_object
);
+ ACPI_FUNCTION_TRACE(
"ds_build_internal_object"
);
*obj_desc_ptr = NULL;
if (op->common.aml_opcode == AML_INT_NAMEPATH_OP) {
*obj_desc_ptr = NULL;
if (op->common.aml_opcode == AML_INT_NAMEPATH_OP) {
@@
-103,7
+103,6
@@
acpi_ds_build_internal_object(struct acpi_walk_state *walk_state,
common.
node)));
if (ACPI_FAILURE(status)) {
common.
node)));
if (ACPI_FAILURE(status)) {
-
/* Check if we are resolving a named reference within a package */
if ((status == AE_NOT_FOUND)
/* Check if we are resolving a named reference within a package */
if ((status == AE_NOT_FOUND)
@@
-187,7
+186,7
@@
acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
union acpi_parse_object *byte_list;
u32 byte_list_length = 0;
union acpi_parse_object *byte_list;
u32 byte_list_length = 0;
- ACPI_FUNCTION_TRACE(
ds_build_internal_buffer_obj
);
+ ACPI_FUNCTION_TRACE(
"ds_build_internal_buffer_obj"
);
/*
* If we are evaluating a Named buffer object "Name (xxxx, Buffer)".
/*
* If we are evaluating a Named buffer object "Name (xxxx, Buffer)".
@@
-196,7
+195,6
@@
acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
*/
obj_desc = *obj_desc_ptr;
if (!obj_desc) {
*/
obj_desc = *obj_desc_ptr;
if (!obj_desc) {
-
/* Create a new buffer object */
obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_BUFFER);
/* Create a new buffer object */
obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_BUFFER);
@@
-245,7
+243,7
@@
acpi_ds_build_internal_buffer_obj(struct acpi_walk_state *walk_state,
"Buffer defined with zero length in AML, creating\n"));
} else {
obj_desc->buffer.pointer =
"Buffer defined with zero length in AML, creating\n"));
} else {
obj_desc->buffer.pointer =
- ACPI_
ALLOCATE_ZEROED
(obj_desc->buffer.length);
+ ACPI_
MEM_CALLOCATE
(obj_desc->buffer.length);
if (!obj_desc->buffer.pointer) {
acpi_ut_delete_object_desc(obj_desc);
return_ACPI_STATUS(AE_NO_MEMORY);
if (!obj_desc->buffer.pointer) {
acpi_ut_delete_object_desc(obj_desc);
return_ACPI_STATUS(AE_NO_MEMORY);
@@
-293,7
+291,7
@@
acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
acpi_status status = AE_OK;
acpi_native_uint i;
acpi_status status = AE_OK;
acpi_native_uint i;
- ACPI_FUNCTION_TRACE(
ds_build_internal_package_obj
);
+ ACPI_FUNCTION_TRACE(
"ds_build_internal_package_obj"
);
/* Find the parent of a possibly nested package */
/* Find the parent of a possibly nested package */
@@
-341,10
+339,9
@@
acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
* individual objects). Add an extra pointer slot so
* that the list is always null terminated.
*/
* individual objects). Add an extra pointer slot so
* that the list is always null terminated.
*/
- obj_desc->package.elements = ACPI_ALLOCATE_ZEROED(((acpi_size)
- obj_desc->package.
- count +
- 1) * sizeof(void *));
+ obj_desc->package.elements = ACPI_MEM_CALLOCATE(((acpi_size) obj_desc->
+ package.count +
+ 1) * sizeof(void *));
if (!obj_desc->package.elements) {
acpi_ut_delete_object_desc(obj_desc);
if (!obj_desc->package.elements) {
acpi_ut_delete_object_desc(obj_desc);
@@
-358,7
+355,6
@@
acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state,
arg = arg->common.next;
for (i = 0; arg; i++) {
if (arg->common.aml_opcode == AML_INT_RETURN_VALUE_OP) {
arg = arg->common.next;
for (i = 0; arg; i++) {
if (arg->common.aml_opcode == AML_INT_RETURN_VALUE_OP) {
-
/* Object (package or buffer) is already built */
obj_desc->package.elements[i] =
/* Object (package or buffer) is already built */
obj_desc->package.elements[i] =
@@
-400,7
+396,7
@@
acpi_ds_create_node(struct acpi_walk_state *walk_state,
acpi_status status;
union acpi_operand_object *obj_desc;
acpi_status status;
union acpi_operand_object *obj_desc;
- ACPI_FUNCTION_TRACE_PTR(
ds_create_node
, op);
+ ACPI_FUNCTION_TRACE_PTR(
"ds_create_node"
, op);
/*
* Because of the execution pass through the non-control-method
/*
* Because of the execution pass through the non-control-method
@@
-412,7
+408,6
@@
acpi_ds_create_node(struct acpi_walk_state *walk_state,
}
if (!op->common.value.arg) {
}
if (!op->common.value.arg) {
-
/* No arguments, there is nothing to do */
return_ACPI_STATUS(AE_OK);
/* No arguments, there is nothing to do */
return_ACPI_STATUS(AE_OK);
@@
-469,12
+464,11
@@
acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
union acpi_operand_object *obj_desc;
acpi_status status = AE_OK;
union acpi_operand_object *obj_desc;
acpi_status status = AE_OK;
- ACPI_FUNCTION_TRACE(
ds_init_object_from_op
);
+ ACPI_FUNCTION_TRACE(
"ds_init_object_from_op"
);
obj_desc = *ret_obj_desc;
op_info = acpi_ps_get_opcode_info(opcode);
if (op_info->class == AML_CLASS_UNKNOWN) {
obj_desc = *ret_obj_desc;
op_info = acpi_ps_get_opcode_info(opcode);
if (op_info->class == AML_CLASS_UNKNOWN) {
-
/* Unknown opcode */
return_ACPI_STATUS(AE_TYPE);
/* Unknown opcode */
return_ACPI_STATUS(AE_TYPE);
@@
-632,7
+626,6
@@
acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
default: /* Other literals, etc.. */
if (op->common.aml_opcode == AML_INT_NAMEPATH_OP) {
default: /* Other literals, etc.. */
if (op->common.aml_opcode == AML_INT_NAMEPATH_OP) {
-
/* Node was saved in Op */
obj_desc->reference.node = op->common.node;
/* Node was saved in Op */
obj_desc->reference.node = op->common.node;