Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / acpi / executer / exresop.c

diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index ba761862a5990c85551c41a9bebaeeedd24b67eb..73e29e566a70450eca74348cbfa3a723316999f6 100644 (file)
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2007, R. Byron Moore
+ * Copyright (C) 2000 - 2008, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -137,7 +137,6 @@ acpi_ex_resolve_operands(u16 opcode,
        union acpi_operand_object *obj_desc;
        acpi_status status = AE_OK;
        u8 object_type;
-       void *temp_node;
        u32 arg_types;
        const struct acpi_opcode_info *op_info;
        u32 this_arg_type;
@@ -239,7 +238,6 @@ acpi_ex_resolve_operands(u16 opcode,
 
                                        /*lint -fallthrough */
 
-                               case AML_NAME_OP:
                                case AML_INDEX_OP:
                                case AML_REF_OF_OP:
                                case AML_ARG_OP:
@@ -332,15 +330,6 @@ acpi_ex_resolve_operands(u16 opcode,
                        if (ACPI_FAILURE(status)) {
                                return_ACPI_STATUS(status);
                        }
-
-                       if (obj_desc->reference.opcode == AML_NAME_OP) {
-
-                               /* Convert a named reference to the actual named object */
-
-                               temp_node = obj_desc->reference.object;
-                               acpi_ut_remove_reference(obj_desc);
-                               (*stack_ptr) = temp_node;
-                       }
                        goto next_operand;
 
                case ARGI_DATAREFOBJ:   /* Store operator only */
@@ -354,8 +343,7 @@ acpi_ex_resolve_operands(u16 opcode,
                        if ((opcode == AML_STORE_OP) &&
                            (ACPI_GET_OBJECT_TYPE(*stack_ptr) ==
                             ACPI_TYPE_LOCAL_REFERENCE)
-                           && ((*stack_ptr)->reference.opcode ==
-                               AML_INDEX_OP)) {
+                           && ((*stack_ptr)->reference.opcode == AML_INDEX_OP)) {
                                goto next_operand;
                        }
                        break;