linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / acpi / dispatcher / dswscope.c

diff --git a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c
index c922897..ada21ef 100644 (file)
--- a/drivers/acpi/dispatcher/dswscope.c
+++ b/drivers/acpi/dispatcher/dswscope.c
@@ -63,10 +63,9 @@ void acpi_ds_scope_stack_clear(struct acpi_walk_state *walk_state)
 {
        union acpi_generic_state *scope_info;
 
-       ACPI_FUNCTION_NAME(ds_scope_stack_clear);
+       ACPI_FUNCTION_NAME("ds_scope_stack_clear");
 
        while (walk_state->scope_info) {
-
                /* Pop a scope off the stack */
 
                scope_info = walk_state->scope_info;
@@ -103,10 +102,9 @@ acpi_ds_scope_stack_push(struct acpi_namespace_node *node,
        union acpi_generic_state *scope_info;
        union acpi_generic_state *old_scope_info;
 
-       ACPI_FUNCTION_TRACE(ds_scope_stack_push);
+       ACPI_FUNCTION_TRACE("ds_scope_stack_push");
 
        if (!node) {
-
                /* Invalid scope   */
 
                ACPI_ERROR((AE_INFO, "Null scope parameter"));
@@ -128,7 +126,7 @@ acpi_ds_scope_stack_push(struct acpi_namespace_node *node,
 
        /* Init new scope object */
 
-       scope_info->common.descriptor_type = ACPI_DESC_TYPE_STATE_WSCOPE;
+       scope_info->common.data_type = ACPI_DESC_TYPE_STATE_WSCOPE;
        scope_info->scope.node = node;
        scope_info->common.value = (u16) type;
 
@@ -178,7 +176,7 @@ acpi_status acpi_ds_scope_stack_pop(struct acpi_walk_state *walk_state)
        union acpi_generic_state *scope_info;
        union acpi_generic_state *new_scope_info;
 
-       ACPI_FUNCTION_TRACE(ds_scope_stack_pop);
+       ACPI_FUNCTION_TRACE("ds_scope_stack_pop");
 
        /*
         * Pop scope info object off the stack.