Pull novell-bugzilla-156426 into release branch
[pandora-kernel.git] / drivers / acpi / executer / exresop.c
index aaba7ab..4c93d09 100644 (file)
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <acpi/acpi.h>
 #include <acpi/amlcode.h>
 #include <acpi/acparser.h>
 #include <acpi/acinterp.h>
-
+#include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_EXECUTER
-        ACPI_MODULE_NAME    ("exresop")
+ACPI_MODULE_NAME("exresop")
 
 /* Local prototypes */
-
 static acpi_status
-acpi_ex_check_object_type (
-       acpi_object_type                type_needed,
-       acpi_object_type                this_type,
-       void                            *object);
-
+acpi_ex_check_object_type(acpi_object_type type_needed,
+                         acpi_object_type this_type, void *object);
 
 /*******************************************************************************
  *
@@ -76,15 +71,13 @@ acpi_ex_check_object_type (
  ******************************************************************************/
 
 static acpi_status
-acpi_ex_check_object_type (
-       acpi_object_type                type_needed,
-       acpi_object_type                this_type,
-       void                            *object)
+acpi_ex_check_object_type(acpi_object_type type_needed,
+                         acpi_object_type this_type, void *object)
 {
-       ACPI_FUNCTION_NAME ("ex_check_object_type");
-
+       ACPI_FUNCTION_ENTRY();
 
        if (type_needed == ACPI_TYPE_ANY) {
+
                /* All types OK, so we don't perform any typechecks */
 
                return (AE_OK);
@@ -97,16 +90,17 @@ acpi_ex_check_object_type (
                 * specification, a store to a constant is a noop.)
                 */
                if ((this_type == ACPI_TYPE_INTEGER) &&
-                       (((union acpi_operand_object *) object)->common.flags & AOPOBJ_AML_CONSTANT)) {
+                   (((union acpi_operand_object *)object)->common.
+                    flags & AOPOBJ_AML_CONSTANT)) {
                        return (AE_OK);
                }
        }
 
        if (type_needed != this_type) {
-               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                       "Needed [%s], found [%s] %p\n",
-                       acpi_ut_get_type_name (type_needed),
-                       acpi_ut_get_type_name (this_type), object));
+               ACPI_ERROR((AE_INFO,
+                           "Needed type [%s], found [%s] %p",
+                           acpi_ut_get_type_name(type_needed),
+                           acpi_ut_get_type_name(this_type), object));
 
                return (AE_AML_OPERAND_TYPE);
        }
@@ -114,7 +108,6 @@ acpi_ex_check_object_type (
        return (AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_resolve_operands
@@ -137,41 +130,37 @@ acpi_ex_check_object_type (
  ******************************************************************************/
 
 acpi_status
-acpi_ex_resolve_operands (
-       u16                             opcode,
-       union acpi_operand_object       **stack_ptr,
-       struct acpi_walk_state          *walk_state)
+acpi_ex_resolve_operands(u16 opcode,
+                        union acpi_operand_object ** stack_ptr,
+                        struct acpi_walk_state * walk_state)
 {
-       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;
-       acpi_object_type                type_needed;
-       u16                             target_op = 0;
-
-
-       ACPI_FUNCTION_TRACE_U32 ("ex_resolve_operands", opcode);
-
-
-       op_info = acpi_ps_get_opcode_info (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;
+       acpi_object_type type_needed;
+       u16 target_op = 0;
+
+       ACPI_FUNCTION_TRACE_U32(ex_resolve_operands, opcode);
+
+       op_info = acpi_ps_get_opcode_info(opcode);
        if (op_info->class == AML_CLASS_UNKNOWN) {
-               return_ACPI_STATUS (AE_AML_BAD_OPCODE);
+               return_ACPI_STATUS(AE_AML_BAD_OPCODE);
        }
 
        arg_types = op_info->runtime_args;
        if (arg_types == ARGI_INVALID_OPCODE) {
-               ACPI_REPORT_ERROR (("resolve_operands: %X is not a valid AML opcode\n",
-                       opcode));
+               ACPI_ERROR((AE_INFO, "Unknown AML opcode %X", opcode));
 
-               return_ACPI_STATUS (AE_AML_INTERNAL);
+               return_ACPI_STATUS(AE_AML_INTERNAL);
        }
 
-       ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-               "Opcode %X [%s] required_operand_types=%8.8X \n",
-               opcode, op_info->name, arg_types));
+       ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
+                         "Opcode %X [%s] RequiredOperandTypes=%8.8X\n",
+                         opcode, op_info->name, arg_types));
 
        /*
         * Normal exit is with (arg_types == 0) at end of argument list.
@@ -180,12 +169,12 @@ acpi_ex_resolve_operands (
         * to) the required type; if stack underflows; or upon
         * finding a NULL stack entry (which should not happen).
         */
-       while (GET_CURRENT_ARG_TYPE (arg_types)) {
+       while (GET_CURRENT_ARG_TYPE(arg_types)) {
                if (!stack_ptr || !*stack_ptr) {
-                       ACPI_REPORT_ERROR (("resolve_operands: Null stack entry at %p\n",
-                               stack_ptr));
+                       ACPI_ERROR((AE_INFO, "Null stack entry at %p",
+                                   stack_ptr));
 
-                       return_ACPI_STATUS (AE_AML_INTERNAL);
+                       return_ACPI_STATUS(AE_AML_INTERNAL);
                }
 
                /* Extract useful items */
@@ -194,37 +183,54 @@ acpi_ex_resolve_operands (
 
                /* Decode the descriptor type */
 
-               switch (ACPI_GET_DESCRIPTOR_TYPE (obj_desc)) {
+               switch (ACPI_GET_DESCRIPTOR_TYPE(obj_desc)) {
                case ACPI_DESC_TYPE_NAMED:
 
                        /* Namespace Node */
 
-                       object_type = ((struct acpi_namespace_node *) obj_desc)->type;
-                       break;
+                       object_type =
+                           ((struct acpi_namespace_node *)obj_desc)->type;
 
+                       /*
+                        * Resolve an alias object. The construction of these objects
+                        * guarantees that there is only one level of alias indirection;
+                        * thus, the attached object is always the aliased namespace node
+                        */
+                       if (object_type == ACPI_TYPE_LOCAL_ALIAS) {
+                               obj_desc =
+                                   acpi_ns_get_attached_object((struct
+                                                                acpi_namespace_node
+                                                                *)obj_desc);
+                               *stack_ptr = obj_desc;
+                               object_type =
+                                   ((struct acpi_namespace_node *)obj_desc)->
+                                   type;
+                       }
+                       break;
 
                case ACPI_DESC_TYPE_OPERAND:
 
                        /* ACPI internal object */
 
-                       object_type = ACPI_GET_OBJECT_TYPE (obj_desc);
+                       object_type = ACPI_GET_OBJECT_TYPE(obj_desc);
 
                        /* Check for bad acpi_object_type */
 
-                       if (!acpi_ut_valid_object_type (object_type)) {
-                               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                       "Bad operand object type [%X]\n",
-                                       object_type));
+                       if (!acpi_ut_valid_object_type(object_type)) {
+                               ACPI_ERROR((AE_INFO,
+                                           "Bad operand object type [%X]",
+                                           object_type));
 
-                               return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                               return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                        }
 
                        if (object_type == (u8) ACPI_TYPE_LOCAL_REFERENCE) {
+
                                /* Decode the Reference */
 
-                               op_info = acpi_ps_get_opcode_info (opcode);
+                               op_info = acpi_ps_get_opcode_info(opcode);
                                if (op_info->class == AML_CLASS_UNKNOWN) {
-                                       return_ACPI_STATUS (AE_AML_BAD_OPCODE);
+                                       return_ACPI_STATUS(AE_AML_BAD_OPCODE);
                                }
 
                                switch (obj_desc->reference.opcode) {
@@ -238,51 +244,58 @@ acpi_ex_resolve_operands (
                                case AML_REF_OF_OP:
                                case AML_ARG_OP:
                                case AML_LOCAL_OP:
-                               case AML_LOAD_OP: /* ddb_handle from LOAD_OP or LOAD_TABLE_OP */
-                               case AML_INT_NAMEPATH_OP: /* Reference to a named object */
-
-                                       ACPI_DEBUG_ONLY_MEMBERS (ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
-                                               "Operand is a Reference, ref_opcode [%s]\n",
-                                               (acpi_ps_get_opcode_info (obj_desc->reference.opcode))->name)));
+                               case AML_LOAD_OP:       /* ddb_handle from LOAD_OP or LOAD_TABLE_OP */
+                               case AML_INT_NAMEPATH_OP:       /* Reference to a named object */
+
+                                       ACPI_DEBUG_ONLY_MEMBERS(ACPI_DEBUG_PRINT
+                                                               ((ACPI_DB_EXEC,
+                                                                 "Operand is a Reference, RefOpcode [%s]\n",
+                                                                 (acpi_ps_get_opcode_info
+                                                                  (obj_desc->
+                                                                   reference.
+                                                                   opcode))->
+                                                                 name)));
                                        break;
 
                                default:
-                                       ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                               "Operand is a Reference, Unknown Reference Opcode %X [%s]\n",
-                                               obj_desc->reference.opcode,
-                                               (acpi_ps_get_opcode_info (obj_desc->reference.opcode))->name));
+                                       ACPI_ERROR((AE_INFO,
+                                                   "Operand is a Reference, Unknown Reference Opcode: %X",
+                                                   obj_desc->reference.
+                                                   opcode));
 
-                                       return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                                       return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                }
                        }
                        break;
 
-
                default:
 
                        /* Invalid descriptor */
 
-                       ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                       "Invalid descriptor %p [%s]\n",
-                                       obj_desc, acpi_ut_get_descriptor_name (obj_desc)));
+                       ACPI_ERROR((AE_INFO,
+                                   "Invalid descriptor %p [%s]",
+                                   obj_desc,
+                                   acpi_ut_get_descriptor_name(obj_desc)));
 
-                       return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                       return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                }
 
                /* Get one argument type, point to the next */
 
-               this_arg_type = GET_CURRENT_ARG_TYPE (arg_types);
-               INCREMENT_ARG_LIST (arg_types);
+               this_arg_type = GET_CURRENT_ARG_TYPE(arg_types);
+               INCREMENT_ARG_LIST(arg_types);
 
                /*
                 * Handle cases where the object does not need to be
                 * resolved to a value
                 */
                switch (this_arg_type) {
-               case ARGI_REF_OR_STRING:        /* Can be a String or Reference */
+               case ARGI_REF_OR_STRING:        /* Can be a String or Reference */
 
-                       if ((ACPI_GET_DESCRIPTOR_TYPE (obj_desc) == ACPI_DESC_TYPE_OPERAND) &&
-                               (ACPI_GET_OBJECT_TYPE (obj_desc) == ACPI_TYPE_STRING)) {
+                       if ((ACPI_GET_DESCRIPTOR_TYPE(obj_desc) ==
+                            ACPI_DESC_TYPE_OPERAND)
+                           && (ACPI_GET_OBJECT_TYPE(obj_desc) ==
+                               ACPI_TYPE_STRING)) {
                                /*
                                 * String found - the string references a named object and
                                 * must be resolved to a node
@@ -296,39 +309,41 @@ acpi_ex_resolve_operands (
                         */
                        /*lint -fallthrough */
 
-               case ARGI_REFERENCE:            /* References: */
+               case ARGI_REFERENCE:    /* References: */
                case ARGI_INTEGER_REF:
                case ARGI_OBJECT_REF:
                case ARGI_DEVICE_REF:
-               case ARGI_TARGETREF:     /* Allows implicit conversion rules before store */
-               case ARGI_FIXED_TARGET:  /* No implicit conversion before store to target */
-               case ARGI_SIMPLE_TARGET: /* Name, Local, or Arg - no implicit conversion  */
+               case ARGI_TARGETREF:    /* Allows implicit conversion rules before store */
+               case ARGI_FIXED_TARGET: /* No implicit conversion before store to target */
+               case ARGI_SIMPLE_TARGET:        /* Name, Local, or Arg - no implicit conversion  */
 
                        /*
                         * Need an operand of type ACPI_TYPE_LOCAL_REFERENCE
                         * A Namespace Node is OK as-is
                         */
-                       if (ACPI_GET_DESCRIPTOR_TYPE (obj_desc) == ACPI_DESC_TYPE_NAMED) {
+                       if (ACPI_GET_DESCRIPTOR_TYPE(obj_desc) ==
+                           ACPI_DESC_TYPE_NAMED) {
                                goto next_operand;
                        }
 
-                       status = acpi_ex_check_object_type (ACPI_TYPE_LOCAL_REFERENCE,
-                                         object_type, obj_desc);
-                       if (ACPI_FAILURE (status)) {
-                               return_ACPI_STATUS (status);
+                       status =
+                           acpi_ex_check_object_type(ACPI_TYPE_LOCAL_REFERENCE,
+                                                     object_type, obj_desc);
+                       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);
+                               acpi_ut_remove_reference(obj_desc);
                                (*stack_ptr) = temp_node;
                        }
                        goto next_operand;
 
-
-               case ARGI_DATAREFOBJ:  /* Store operator only */
+               case ARGI_DATAREFOBJ:   /* Store operator only */
 
                        /*
                         * We don't want to resolve index_op reference objects during
@@ -337,8 +352,10 @@ acpi_ex_resolve_operands (
                         * -- All others must be resolved below.
                         */
                        if ((opcode == AML_STORE_OP) &&
-                               (ACPI_GET_OBJECT_TYPE (*stack_ptr) == ACPI_TYPE_LOCAL_REFERENCE) &&
-                               ((*stack_ptr)->reference.opcode == AML_INDEX_OP)) {
+                           (ACPI_GET_OBJECT_TYPE(*stack_ptr) ==
+                            ACPI_TYPE_LOCAL_REFERENCE)
+                           && ((*stack_ptr)->reference.opcode ==
+                               AML_INDEX_OP)) {
                                goto next_operand;
                        }
                        break;
@@ -351,9 +368,9 @@ acpi_ex_resolve_operands (
                /*
                 * Resolve this object to a value
                 */
-               status = acpi_ex_resolve_to_value (stack_ptr, walk_state);
-               if (ACPI_FAILURE (status)) {
-                       return_ACPI_STATUS (status);
+               status = acpi_ex_resolve_to_value(stack_ptr, walk_state);
+               if (ACPI_FAILURE(status)) {
+                       return_ACPI_STATUS(status);
                }
 
                /* Get the resolved object */
@@ -364,10 +381,10 @@ acpi_ex_resolve_operands (
                 * Check the resulting object (value) type
                 */
                switch (this_arg_type) {
-               /*
-                * For the simple cases, only one type of resolved object
-                * is allowed
-                */
+                       /*
+                        * For the simple cases, only one type of resolved object
+                        * is allowed
+                        */
                case ARGI_MUTEX:
 
                        /* Need an operand of type ACPI_TYPE_MUTEX */
@@ -382,7 +399,7 @@ acpi_ex_resolve_operands (
                        type_needed = ACPI_TYPE_EVENT;
                        break;
 
-               case ARGI_PACKAGE:   /* Package */
+               case ARGI_PACKAGE:      /* Package */
 
                        /* Need an operand of type ACPI_TYPE_PACKAGE */
 
@@ -403,10 +420,9 @@ acpi_ex_resolve_operands (
                        type_needed = ACPI_TYPE_LOCAL_REFERENCE;
                        break;
 
-
-               /*
-                * The more complex cases allow multiple resolved object types
-                */
+                       /*
+                        * The more complex cases allow multiple resolved object types
+                        */
                case ARGI_INTEGER:
 
                        /*
@@ -414,25 +430,26 @@ acpi_ex_resolve_operands (
                         * But we can implicitly convert from a STRING or BUFFER
                         * Aka - "Implicit Source Operand Conversion"
                         */
-                       status = acpi_ex_convert_to_integer (obj_desc, stack_ptr, 16);
-                       if (ACPI_FAILURE (status)) {
+                       status =
+                           acpi_ex_convert_to_integer(obj_desc, stack_ptr, 16);
+                       if (ACPI_FAILURE(status)) {
                                if (status == AE_TYPE) {
-                                       ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                               "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                               acpi_ut_get_object_type_name (obj_desc), obj_desc));
+                                       ACPI_ERROR((AE_INFO,
+                                                   "Needed [Integer/String/Buffer], found [%s] %p",
+                                                   acpi_ut_get_object_type_name
+                                                   (obj_desc), obj_desc));
 
-                                       return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                                       return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                }
 
-                               return_ACPI_STATUS (status);
+                               return_ACPI_STATUS(status);
                        }
 
                        if (obj_desc != *stack_ptr) {
-                               acpi_ut_remove_reference (obj_desc);
+                               acpi_ut_remove_reference(obj_desc);
                        }
                        goto next_operand;
 
-
                case ARGI_BUFFER:
 
                        /*
@@ -440,25 +457,25 @@ acpi_ex_resolve_operands (
                         * But we can implicitly convert from a STRING or INTEGER
                         * Aka - "Implicit Source Operand Conversion"
                         */
-                       status = acpi_ex_convert_to_buffer (obj_desc, stack_ptr);
-                       if (ACPI_FAILURE (status)) {
+                       status = acpi_ex_convert_to_buffer(obj_desc, stack_ptr);
+                       if (ACPI_FAILURE(status)) {
                                if (status == AE_TYPE) {
-                                       ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                               "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                               acpi_ut_get_object_type_name (obj_desc), obj_desc));
+                                       ACPI_ERROR((AE_INFO,
+                                                   "Needed [Integer/String/Buffer], found [%s] %p",
+                                                   acpi_ut_get_object_type_name
+                                                   (obj_desc), obj_desc));
 
-                                       return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                                       return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                }
 
-                               return_ACPI_STATUS (status);
+                               return_ACPI_STATUS(status);
                        }
 
                        if (obj_desc != *stack_ptr) {
-                               acpi_ut_remove_reference (obj_desc);
+                               acpi_ut_remove_reference(obj_desc);
                        }
                        goto next_operand;
 
-
                case ARGI_STRING:
 
                        /*
@@ -466,83 +483,85 @@ acpi_ex_resolve_operands (
                         * But we can implicitly convert from a BUFFER or INTEGER
                         * Aka - "Implicit Source Operand Conversion"
                         */
-                       status = acpi_ex_convert_to_string (obj_desc, stack_ptr,
-                                        ACPI_IMPLICIT_CONVERT_HEX);
-                       if (ACPI_FAILURE (status)) {
+                       status = acpi_ex_convert_to_string(obj_desc, stack_ptr,
+                                                          ACPI_IMPLICIT_CONVERT_HEX);
+                       if (ACPI_FAILURE(status)) {
                                if (status == AE_TYPE) {
-                                       ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                               "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                               acpi_ut_get_object_type_name (obj_desc), obj_desc));
+                                       ACPI_ERROR((AE_INFO,
+                                                   "Needed [Integer/String/Buffer], found [%s] %p",
+                                                   acpi_ut_get_object_type_name
+                                                   (obj_desc), obj_desc));
 
-                                       return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                                       return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                                }
 
-                               return_ACPI_STATUS (status);
+                               return_ACPI_STATUS(status);
                        }
 
                        if (obj_desc != *stack_ptr) {
-                               acpi_ut_remove_reference (obj_desc);
+                               acpi_ut_remove_reference(obj_desc);
                        }
                        goto next_operand;
 
-
                case ARGI_COMPUTEDATA:
 
                        /* Need an operand of type INTEGER, STRING or BUFFER */
 
-                       switch (ACPI_GET_OBJECT_TYPE (obj_desc)) {
+                       switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
                        case ACPI_TYPE_INTEGER:
                        case ACPI_TYPE_STRING:
                        case ACPI_TYPE_BUFFER:
 
                                /* Valid operand */
-                          break;
+                               break;
 
                        default:
-                               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                       "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                       acpi_ut_get_object_type_name (obj_desc), obj_desc));
+                               ACPI_ERROR((AE_INFO,
+                                           "Needed [Integer/String/Buffer], found [%s] %p",
+                                           acpi_ut_get_object_type_name
+                                           (obj_desc), obj_desc));
 
-                               return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                               return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                        }
                        goto next_operand;
 
-
                case ARGI_BUFFER_OR_STRING:
 
                        /* Need an operand of type STRING or BUFFER */
 
-                       switch (ACPI_GET_OBJECT_TYPE (obj_desc)) {
+                       switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
                        case ACPI_TYPE_STRING:
                        case ACPI_TYPE_BUFFER:
 
                                /* Valid operand */
-                          break;
+                               break;
 
                        case ACPI_TYPE_INTEGER:
 
                                /* Highest priority conversion is to type Buffer */
 
-                               status = acpi_ex_convert_to_buffer (obj_desc, stack_ptr);
-                               if (ACPI_FAILURE (status)) {
-                                       return_ACPI_STATUS (status);
+                               status =
+                                   acpi_ex_convert_to_buffer(obj_desc,
+                                                             stack_ptr);
+                               if (ACPI_FAILURE(status)) {
+                                       return_ACPI_STATUS(status);
                                }
 
                                if (obj_desc != *stack_ptr) {
-                                       acpi_ut_remove_reference (obj_desc);
+                                       acpi_ut_remove_reference(obj_desc);
                                }
                                break;
 
                        default:
-                               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                       "Needed [Integer/String/Buffer], found [%s] %p\n",
-                                       acpi_ut_get_object_type_name (obj_desc), obj_desc));
+                               ACPI_ERROR((AE_INFO,
+                                           "Needed [Integer/String/Buffer], found [%s] %p",
+                                           acpi_ut_get_object_type_name
+                                           (obj_desc), obj_desc));
 
-                               return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                               return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                        }
                        goto next_operand;
 
-
                case ARGI_DATAOBJECT:
                        /*
                         * ARGI_DATAOBJECT is only used by the size_of operator.
@@ -551,7 +570,7 @@ acpi_ex_resolve_operands (
                         * The only reference allowed here is a direct reference to
                         * a namespace node.
                         */
-                       switch (ACPI_GET_OBJECT_TYPE (obj_desc)) {
+                       switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
                        case ACPI_TYPE_PACKAGE:
                        case ACPI_TYPE_STRING:
                        case ACPI_TYPE_BUFFER:
@@ -561,20 +580,20 @@ acpi_ex_resolve_operands (
                                break;
 
                        default:
-                               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                       "Needed [Buffer/String/Package/Reference], found [%s] %p\n",
-                                       acpi_ut_get_object_type_name (obj_desc), obj_desc));
+                               ACPI_ERROR((AE_INFO,
+                                           "Needed [Buffer/String/Package/Reference], found [%s] %p",
+                                           acpi_ut_get_object_type_name
+                                           (obj_desc), obj_desc));
 
-                               return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                               return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                        }
                        goto next_operand;
 
-
                case ARGI_COMPLEXOBJ:
 
                        /* Need a buffer or package or (ACPI 2.0) String */
 
-                       switch (ACPI_GET_OBJECT_TYPE (obj_desc)) {
+                       switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
                        case ACPI_TYPE_PACKAGE:
                        case ACPI_TYPE_STRING:
                        case ACPI_TYPE_BUFFER:
@@ -583,20 +602,20 @@ acpi_ex_resolve_operands (
                                break;
 
                        default:
-                               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                       "Needed [Buffer/String/Package], found [%s] %p\n",
-                                       acpi_ut_get_object_type_name (obj_desc), obj_desc));
+                               ACPI_ERROR((AE_INFO,
+                                           "Needed [Buffer/String/Package], found [%s] %p",
+                                           acpi_ut_get_object_type_name
+                                           (obj_desc), obj_desc));
 
-                               return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                               return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                        }
                        goto next_operand;
 
-
                case ARGI_REGION_OR_FIELD:
 
                        /* Need an operand of type REGION or a FIELD in a region */
 
-                       switch (ACPI_GET_OBJECT_TYPE (obj_desc)) {
+                       switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
                        case ACPI_TYPE_REGION:
                        case ACPI_TYPE_LOCAL_REGION_FIELD:
                        case ACPI_TYPE_LOCAL_BANK_FIELD:
@@ -606,20 +625,20 @@ acpi_ex_resolve_operands (
                                break;
 
                        default:
-                               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                       "Needed [Region/region_field], found [%s] %p\n",
-                                       acpi_ut_get_object_type_name (obj_desc), obj_desc));
+                               ACPI_ERROR((AE_INFO,
+                                           "Needed [Region/RegionField], found [%s] %p",
+                                           acpi_ut_get_object_type_name
+                                           (obj_desc), obj_desc));
 
-                               return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                               return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                        }
                        goto next_operand;
 
-
                case ARGI_DATAREFOBJ:
 
                        /* Used by the Store() operator only */
 
-                       switch (ACPI_GET_OBJECT_TYPE (obj_desc)) {
+                       switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
                        case ACPI_TYPE_INTEGER:
                        case ACPI_TYPE_PACKAGE:
                        case ACPI_TYPE_STRING:
@@ -646,52 +665,52 @@ acpi_ex_resolve_operands (
                                }
 
                                if (target_op == AML_DEBUG_OP) {
+
                                        /* Allow store of any object to the Debug object */
 
                                        break;
                                }
 
-                               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                       "Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p\n",
-                                       acpi_ut_get_object_type_name (obj_desc), obj_desc));
+                               ACPI_ERROR((AE_INFO,
+                                           "Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p",
+                                           acpi_ut_get_object_type_name
+                                           (obj_desc), obj_desc));
 
-                               return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                               return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                        }
                        goto next_operand;
 
-
                default:
 
                        /* Unknown type */
 
-                       ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                               "Internal - Unknown ARGI (required operand) type %X\n",
-                               this_arg_type));
+                       ACPI_ERROR((AE_INFO,
+                                   "Internal - Unknown ARGI (required operand) type %X",
+                                   this_arg_type));
 
-                       return_ACPI_STATUS (AE_BAD_PARAMETER);
+                       return_ACPI_STATUS(AE_BAD_PARAMETER);
                }
 
                /*
                 * Make sure that the original object was resolved to the
                 * required object type (Simple cases only).
                 */
-               status = acpi_ex_check_object_type (type_needed,
-                                 ACPI_GET_OBJECT_TYPE (*stack_ptr), *stack_ptr);
-               if (ACPI_FAILURE (status)) {
-                       return_ACPI_STATUS (status);
+               status = acpi_ex_check_object_type(type_needed,
+                                                  ACPI_GET_OBJECT_TYPE
+                                                  (*stack_ptr), *stack_ptr);
+               if (ACPI_FAILURE(status)) {
+                       return_ACPI_STATUS(status);
                }
 
-next_operand:
+             next_operand:
                /*
                 * If more operands needed, decrement stack_ptr to point
                 * to next operand on stack
                 */
-               if (GET_CURRENT_ARG_TYPE (arg_types)) {
+               if (GET_CURRENT_ARG_TYPE(arg_types)) {
                        stack_ptr--;
                }
        }
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
-
-