Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / acpi / utilities / utcopy.c
index 0fcd98b..df2d320 100644 (file)
@@ -5,7 +5,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>
 
-
 #define _COMPONENT          ACPI_UTILITIES
-        ACPI_MODULE_NAME    ("utcopy")
+ACPI_MODULE_NAME("utcopy")
+
+/* Local prototypes */
+static acpi_status
+acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
+                               union acpi_object *external_object,
+                               u8 * data_space, acpi_size * buffer_space_used);
+
+static acpi_status
+acpi_ut_copy_ielement_to_ielement(u8 object_type,
+                                 union acpi_operand_object *source_object,
+                                 union acpi_generic_state *state,
+                                 void *context);
+
+static acpi_status
+acpi_ut_copy_ipackage_to_epackage(union acpi_operand_object *internal_object,
+                                 u8 * buffer, acpi_size * space_used);
+
+static acpi_status
+acpi_ut_copy_esimple_to_isimple(union acpi_object *user_obj,
+                               union acpi_operand_object **return_obj);
+
+static acpi_status
+acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
+                          union acpi_operand_object *dest_desc);
 
+static acpi_status
+acpi_ut_copy_ielement_to_eelement(u8 object_type,
+                                 union acpi_operand_object *source_object,
+                                 union acpi_generic_state *state,
+                                 void *context);
+
+static acpi_status
+acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,
+                                 union acpi_operand_object *dest_obj,
+                                 struct acpi_walk_state *walk_state);
 
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_copy_isimple_to_esimple
  *
- * PARAMETERS:  *internal_object    - Pointer to the object we are examining
- *              *Buffer             - Where the object is returned
- *              *space_used         - Where the data length is returned
+ * PARAMETERS:  internal_object     - Source object to be copied
+ *              external_object     - Where to return the copied object
+ *              data_space          - Where object data is returned (such as
+ *                                    buffer and string data)
+ *              buffer_space_used   - Length of data_space that was used
  *
  * RETURN:      Status
  *
- * DESCRIPTION: This function is called to place a simple object in a user
- *              buffer.
+ * DESCRIPTION: This function is called to copy a simple internal object to
+ *              an external object.
  *
- *              The buffer is assumed to have sufficient space for the object.
+ *              The data_space buffer is assumed to have sufficient space for
+ *              the object.
  *
  ******************************************************************************/
 
 static acpi_status
-acpi_ut_copy_isimple_to_esimple (
-       union acpi_operand_object       *internal_object,
-       union acpi_object               *external_object,
-       u8                              *data_space,
-       acpi_size                       *buffer_space_used)
+acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
+                               union acpi_object *external_object,
+                               u8 * data_space, acpi_size * buffer_space_used)
 {
-       acpi_status                     status = AE_OK;
-
-
-       ACPI_FUNCTION_TRACE ("ut_copy_isimple_to_esimple");
+       acpi_status status = AE_OK;
 
+       ACPI_FUNCTION_TRACE("ut_copy_isimple_to_esimple");
 
        *buffer_space_used = 0;
 
@@ -87,50 +118,54 @@ acpi_ut_copy_isimple_to_esimple (
         * package element)
         */
        if (!internal_object) {
-               return_ACPI_STATUS (AE_OK);
+               return_ACPI_STATUS(AE_OK);
        }
 
        /* Always clear the external object */
 
-       ACPI_MEMSET (external_object, 0, sizeof (union acpi_object));
+       ACPI_MEMSET(external_object, 0, sizeof(union acpi_object));
 
        /*
         * In general, the external object will be the same type as
         * the internal object
         */
-       external_object->type = ACPI_GET_OBJECT_TYPE (internal_object);
+       external_object->type = ACPI_GET_OBJECT_TYPE(internal_object);
 
        /* However, only a limited number of external types are supported */
 
-       switch (ACPI_GET_OBJECT_TYPE (internal_object)) {
+       switch (ACPI_GET_OBJECT_TYPE(internal_object)) {
        case ACPI_TYPE_STRING:
 
-               external_object->string.pointer = (char *) data_space;
+               external_object->string.pointer = (char *)data_space;
                external_object->string.length = internal_object->string.length;
-               *buffer_space_used = ACPI_ROUND_UP_TO_NATIVE_WORD ((acpi_size) internal_object->string.length + 1);
-
-               ACPI_MEMCPY ((void *) data_space, (void *) internal_object->string.pointer,
-                                (acpi_size) internal_object->string.length + 1);
+               *buffer_space_used = ACPI_ROUND_UP_TO_NATIVE_WORD((acpi_size)
+                                                                 internal_object->
+                                                                 string.
+                                                                 length + 1);
+
+               ACPI_MEMCPY((void *)data_space,
+                           (void *)internal_object->string.pointer,
+                           (acpi_size) internal_object->string.length + 1);
                break;
 
-
        case ACPI_TYPE_BUFFER:
 
                external_object->buffer.pointer = data_space;
                external_object->buffer.length = internal_object->buffer.length;
-               *buffer_space_used = ACPI_ROUND_UP_TO_NATIVE_WORD (internal_object->string.length);
+               *buffer_space_used =
+                   ACPI_ROUND_UP_TO_NATIVE_WORD(internal_object->string.
+                                                length);
 
-               ACPI_MEMCPY ((void *) data_space, (void *) internal_object->buffer.pointer,
-                                internal_object->buffer.length);
+               ACPI_MEMCPY((void *)data_space,
+                           (void *)internal_object->buffer.pointer,
+                           internal_object->buffer.length);
                break;
 
-
        case ACPI_TYPE_INTEGER:
 
                external_object->integer.value = internal_object->integer.value;
                break;
 
-
        case ACPI_TYPE_LOCAL_REFERENCE:
 
                /*
@@ -147,41 +182,41 @@ acpi_ut_copy_isimple_to_esimple (
                         * to object containing a handle to an ACPI named object.
                         */
                        external_object->type = ACPI_TYPE_ANY;
-                       external_object->reference.handle = internal_object->reference.node;
+                       external_object->reference.handle =
+                           internal_object->reference.node;
                        break;
                }
                break;
 
-
        case ACPI_TYPE_PROCESSOR:
 
-               external_object->processor.proc_id    = internal_object->processor.proc_id;
-               external_object->processor.pblk_address = internal_object->processor.address;
-               external_object->processor.pblk_length = internal_object->processor.length;
+               external_object->processor.proc_id =
+                   internal_object->processor.proc_id;
+               external_object->processor.pblk_address =
+                   internal_object->processor.address;
+               external_object->processor.pblk_length =
+                   internal_object->processor.length;
                break;
 
-
        case ACPI_TYPE_POWER:
 
                external_object->power_resource.system_level =
-                                  internal_object->power_resource.system_level;
+                   internal_object->power_resource.system_level;
 
                external_object->power_resource.resource_order =
-                                  internal_object->power_resource.resource_order;
+                   internal_object->power_resource.resource_order;
                break;
 
-
        default:
                /*
                 * There is no corresponding external object type
                 */
-               return_ACPI_STATUS (AE_SUPPORT);
+               return_ACPI_STATUS(AE_SUPPORT);
        }
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_copy_ielement_to_eelement
@@ -194,26 +229,24 @@ acpi_ut_copy_isimple_to_esimple (
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ut_copy_ielement_to_eelement (
-       u8                              object_type,
-       union acpi_operand_object       *source_object,
-       union acpi_generic_state        *state,
-       void                            *context)
+static acpi_status
+acpi_ut_copy_ielement_to_eelement(u8 object_type,
+                                 union acpi_operand_object *source_object,
+                                 union acpi_generic_state *state,
+                                 void *context)
 {
-       acpi_status                     status = AE_OK;
-       struct acpi_pkg_info            *info = (struct acpi_pkg_info *) context;
-       acpi_size                       object_space;
-       u32                             this_index;
-       union acpi_object               *target_object;
-
-
-       ACPI_FUNCTION_ENTRY ();
+       acpi_status status = AE_OK;
+       struct acpi_pkg_info *info = (struct acpi_pkg_info *)context;
+       acpi_size object_space;
+       u32 this_index;
+       union acpi_object *target_object;
 
+       ACPI_FUNCTION_ENTRY();
 
-       this_index   = state->pkg.index;
+       this_index = state->pkg.index;
        target_object = (union acpi_object *)
-                         &((union acpi_object *)(state->pkg.dest_object))->package.elements[this_index];
+           &((union acpi_object *)(state->pkg.dest_object))->package.
+           elements[this_index];
 
        switch (object_type) {
        case ACPI_COPY_TYPE_SIMPLE:
@@ -221,22 +254,24 @@ acpi_ut_copy_ielement_to_eelement (
                /*
                 * This is a simple or null object
                 */
-               status = acpi_ut_copy_isimple_to_esimple (source_object,
-                                 target_object, info->free_space, &object_space);
-               if (ACPI_FAILURE (status)) {
+               status = acpi_ut_copy_isimple_to_esimple(source_object,
+                                                        target_object,
+                                                        info->free_space,
+                                                        &object_space);
+               if (ACPI_FAILURE(status)) {
                        return (status);
                }
                break;
 
-
        case ACPI_COPY_TYPE_PACKAGE:
 
                /*
                 * Build the package object
                 */
-               target_object->type             = ACPI_TYPE_PACKAGE;
-               target_object->package.count    = source_object->package.count;
-               target_object->package.elements = ACPI_CAST_PTR (union acpi_object, info->free_space);
+               target_object->type = ACPI_TYPE_PACKAGE;
+               target_object->package.count = source_object->package.count;
+               target_object->package.elements =
+                   ACPI_CAST_PTR(union acpi_object, info->free_space);
 
                /*
                 * Pass the new package object back to the package walk routine
@@ -247,28 +282,29 @@ acpi_ut_copy_ielement_to_eelement (
                 * Save space for the array of objects (Package elements)
                 * update the buffer length counter
                 */
-               object_space = ACPI_ROUND_UP_TO_NATIVE_WORD (
-                                  (acpi_size) target_object->package.count * sizeof (union acpi_object));
+               object_space = ACPI_ROUND_UP_TO_NATIVE_WORD((acpi_size)
+                                                           target_object->
+                                                           package.count *
+                                                           sizeof(union
+                                                                  acpi_object));
                break;
 
-
        default:
                return (AE_BAD_PARAMETER);
        }
 
-       info->free_space  += object_space;
-       info->length      += object_space;
+       info->free_space += object_space;
+       info->length += object_space;
        return (status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_copy_ipackage_to_epackage
  *
- * PARAMETERS:  *internal_object    - Pointer to the object we are returning
- *              *Buffer             - Where the object is returned
- *              *space_used         - Where the object length is returned
+ * PARAMETERS:  internal_object     - Pointer to the object we are returning
+ *              Buffer              - Where the object is returned
+ *              space_used          - Where the object length is returned
  *
  * RETURN:      Status
  *
@@ -282,59 +318,57 @@ acpi_ut_copy_ielement_to_eelement (
  ******************************************************************************/
 
 static acpi_status
-acpi_ut_copy_ipackage_to_epackage (
-       union acpi_operand_object       *internal_object,
-       u8                              *buffer,
-       acpi_size                       *space_used)
+acpi_ut_copy_ipackage_to_epackage(union acpi_operand_object *internal_object,
+                                 u8 * buffer, acpi_size * space_used)
 {
-       union acpi_object               *external_object;
-       acpi_status                     status;
-       struct acpi_pkg_info            info;
-
-
-       ACPI_FUNCTION_TRACE ("ut_copy_ipackage_to_epackage");
+       union acpi_object *external_object;
+       acpi_status status;
+       struct acpi_pkg_info info;
 
+       ACPI_FUNCTION_TRACE("ut_copy_ipackage_to_epackage");
 
        /*
         * First package at head of the buffer
         */
-       external_object = ACPI_CAST_PTR (union acpi_object, buffer);
+       external_object = ACPI_CAST_PTR(union acpi_object, buffer);
 
        /*
         * Free space begins right after the first package
         */
-       info.length      = ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (union acpi_object));
-       info.free_space  = buffer + ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (union acpi_object));
+       info.length = ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof(union acpi_object));
+       info.free_space =
+           buffer + ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof(union acpi_object));
        info.object_space = 0;
        info.num_packages = 1;
 
-       external_object->type            = ACPI_GET_OBJECT_TYPE (internal_object);
-       external_object->package.count   = internal_object->package.count;
-       external_object->package.elements = ACPI_CAST_PTR (union acpi_object, info.free_space);
+       external_object->type = ACPI_GET_OBJECT_TYPE(internal_object);
+       external_object->package.count = internal_object->package.count;
+       external_object->package.elements = ACPI_CAST_PTR(union acpi_object,
+                                                         info.free_space);
 
        /*
         * Leave room for an array of ACPI_OBJECTS in the buffer
         * and move the free space past it
         */
-       info.length    += (acpi_size) external_object->package.count *
-                        ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (union acpi_object));
+       info.length += (acpi_size) external_object->package.count *
+           ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof(union acpi_object));
        info.free_space += external_object->package.count *
-                        ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (union acpi_object));
+           ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof(union acpi_object));
 
-       status = acpi_ut_walk_package_tree (internal_object, external_object,
-                        acpi_ut_copy_ielement_to_eelement, &info);
+       status = acpi_ut_walk_package_tree(internal_object, external_object,
+                                          acpi_ut_copy_ielement_to_eelement,
+                                          &info);
 
        *space_used = info.length;
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_copy_iobject_to_eobject
  *
- * PARAMETERS:  *internal_object    - The internal object to be converted
- *              *buffer_ptr         - Where the object is returned
+ * PARAMETERS:  internal_object     - The internal object to be converted
+ *              buffer_ptr          - Where the object is returned
  *
  * RETURN:      Status
  *
@@ -344,50 +378,54 @@ acpi_ut_copy_ipackage_to_epackage (
  ******************************************************************************/
 
 acpi_status
-acpi_ut_copy_iobject_to_eobject (
-       union acpi_operand_object       *internal_object,
-       struct acpi_buffer              *ret_buffer)
+acpi_ut_copy_iobject_to_eobject(union acpi_operand_object *internal_object,
+                               struct acpi_buffer *ret_buffer)
 {
-       acpi_status                     status;
-
+       acpi_status status;
 
-       ACPI_FUNCTION_TRACE ("ut_copy_iobject_to_eobject");
+       ACPI_FUNCTION_TRACE("ut_copy_iobject_to_eobject");
 
-
-       if (ACPI_GET_OBJECT_TYPE (internal_object) == ACPI_TYPE_PACKAGE) {
+       if (ACPI_GET_OBJECT_TYPE(internal_object) == ACPI_TYPE_PACKAGE) {
                /*
                 * Package object:  Copy all subobjects (including
                 * nested packages)
                 */
-               status = acpi_ut_copy_ipackage_to_epackage (internal_object,
-                                 ret_buffer->pointer, &ret_buffer->length);
-       }
-       else {
+               status = acpi_ut_copy_ipackage_to_epackage(internal_object,
+                                                          ret_buffer->pointer,
+                                                          &ret_buffer->length);
+       else {
                /*
                 * Build a simple object (no nested objects)
                 */
-               status = acpi_ut_copy_isimple_to_esimple (internal_object,
-                                 (union acpi_object *) ret_buffer->pointer,
-                                 ((u8 *) ret_buffer->pointer +
-                                 ACPI_ROUND_UP_TO_NATIVE_WORD (sizeof (union acpi_object))),
-                                 &ret_buffer->length);
+               status = acpi_ut_copy_isimple_to_esimple(internal_object,
+                                                        ACPI_CAST_PTR(union
+                                                                      acpi_object,
+                                                                      ret_buffer->
+                                                                      pointer),
+                                                        ACPI_ADD_PTR(u8,
+                                                                     ret_buffer->
+                                                                     pointer,
+                                                                     ACPI_ROUND_UP_TO_NATIVE_WORD
+                                                                     (sizeof
+                                                                      (union
+                                                                       acpi_object))),
+                                                        &ret_buffer->length);
                /*
                 * build simple does not include the object size in the length
                 * so we add it in here
                 */
-               ret_buffer->length += sizeof (union acpi_object);
+               ret_buffer->length += sizeof(union acpi_object);
        }
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_copy_esimple_to_isimple
  *
- * PARAMETERS:  *external_object   - The external object to be converted
- *              *internal_object   - Where the internal object is returned
+ * PARAMETERS:  external_object     - The external object to be converted
+ *              ret_internal_object - Where the internal object is returned
  *
  * RETURN:      Status
  *
@@ -398,16 +436,13 @@ acpi_ut_copy_iobject_to_eobject (
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ut_copy_esimple_to_isimple (
-       union acpi_object               *external_object,
-       union acpi_operand_object       **ret_internal_object)
+static acpi_status
+acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
+                               union acpi_operand_object **ret_internal_object)
 {
-       union acpi_operand_object       *internal_object;
-
-
-       ACPI_FUNCTION_TRACE ("ut_copy_esimple_to_isimple");
+       union acpi_operand_object *internal_object;
 
+       ACPI_FUNCTION_TRACE("ut_copy_esimple_to_isimple");
 
        /*
         * Simple types supported are: String, Buffer, Integer
@@ -417,57 +452,57 @@ acpi_ut_copy_esimple_to_isimple (
        case ACPI_TYPE_BUFFER:
        case ACPI_TYPE_INTEGER:
 
-               internal_object = acpi_ut_create_internal_object ((u8) external_object->type);
+               internal_object = acpi_ut_create_internal_object((u8)
+                                                                external_object->
+                                                                type);
                if (!internal_object) {
-                       return_ACPI_STATUS (AE_NO_MEMORY);
+                       return_ACPI_STATUS(AE_NO_MEMORY);
                }
                break;
 
        default:
                /* All other types are not supported */
 
-               return_ACPI_STATUS (AE_SUPPORT);
+               return_ACPI_STATUS(AE_SUPPORT);
        }
 
-
        /* Must COPY string and buffer contents */
 
        switch (external_object->type) {
        case ACPI_TYPE_STRING:
 
                internal_object->string.pointer =
-                       ACPI_MEM_CALLOCATE ((acpi_size) external_object->string.length + 1);
+                   ACPI_MEM_CALLOCATE((acpi_size) external_object->string.
+                                      length + 1);
                if (!internal_object->string.pointer) {
                        goto error_exit;
                }
 
-               ACPI_MEMCPY (internal_object->string.pointer,
-                                 external_object->string.pointer,
-                                 external_object->string.length);
+               ACPI_MEMCPY(internal_object->string.pointer,
+                           external_object->string.pointer,
+                           external_object->string.length);
 
                internal_object->string.length = external_object->string.length;
                break;
 
-
        case ACPI_TYPE_BUFFER:
 
                internal_object->buffer.pointer =
-                       ACPI_MEM_CALLOCATE (external_object->buffer.length);
+                   ACPI_MEM_CALLOCATE(external_object->buffer.length);
                if (!internal_object->buffer.pointer) {
                        goto error_exit;
                }
 
-               ACPI_MEMCPY (internal_object->buffer.pointer,
-                                 external_object->buffer.pointer,
-                                 external_object->buffer.length);
+               ACPI_MEMCPY(internal_object->buffer.pointer,
+                           external_object->buffer.pointer,
+                           external_object->buffer.length);
 
                internal_object->buffer.length = external_object->buffer.length;
                break;
 
-
        case ACPI_TYPE_INTEGER:
 
-               internal_object->integer.value  = external_object->integer.value;
+               internal_object->integer.value = external_object->integer.value;
                break;
 
        default:
@@ -476,17 +511,14 @@ acpi_ut_copy_esimple_to_isimple (
        }
 
        *ret_internal_object = internal_object;
-       return_ACPI_STATUS (AE_OK);
-
+       return_ACPI_STATUS(AE_OK);
 
-error_exit:
-       acpi_ut_remove_reference (internal_object);
-       return_ACPI_STATUS (AE_NO_MEMORY);
+      error_exit:
+       acpi_ut_remove_reference(internal_object);
+       return_ACPI_STATUS(AE_NO_MEMORY);
 }
 
-
 #ifdef ACPI_FUTURE_IMPLEMENTATION
-
 /* Code to convert packages that are parameters to control methods */
 
 /*******************************************************************************
@@ -509,22 +541,18 @@ error_exit:
  ******************************************************************************/
 
 static acpi_status
-acpi_ut_copy_epackage_to_ipackage (
-       union acpi_operand_object       *internal_object,
-       u8                              *buffer,
-       u32                             *space_used)
+acpi_ut_copy_epackage_to_ipackage(union acpi_operand_object *internal_object,
+                                 u8 * buffer, u32 * space_used)
 {
-       u8                              *free_space;
-       union acpi_object               *external_object;
-       u32                             length = 0;
-       u32                             this_index;
-       u32                             object_space = 0;
-       union acpi_operand_object       *this_internal_obj;
-       union acpi_object               *this_external_obj;
-
-
-       ACPI_FUNCTION_TRACE ("ut_copy_epackage_to_ipackage");
+       u8 *free_space;
+       union acpi_object *external_object;
+       u32 length = 0;
+       u32 this_index;
+       u32 object_space = 0;
+       union acpi_operand_object *this_internal_obj;
+       union acpi_object *this_external_obj;
 
+       ACPI_FUNCTION_TRACE("ut_copy_epackage_to_ipackage");
 
        /*
         * First package at head of the buffer
@@ -536,24 +564,22 @@ acpi_ut_copy_epackage_to_ipackage (
         */
        free_space = buffer + sizeof(union acpi_object);
 
-
-       external_object->type              = ACPI_GET_OBJECT_TYPE (internal_object);
-       external_object->package.count     = internal_object->package.count;
-       external_object->package.elements  = (union acpi_object *)free_space;
+       external_object->type = ACPI_GET_OBJECT_TYPE(internal_object);
+       external_object->package.count = internal_object->package.count;
+       external_object->package.elements = (union acpi_object *)free_space;
 
        /*
         * Build an array of ACPI_OBJECTS in the buffer
         * and move the free space past it
         */
-       free_space += external_object->package.count * sizeof(union acpi_object);
-
+       free_space +=
+           external_object->package.count * sizeof(union acpi_object);
 
        /* Call walk_package */
 
 }
 
-#endif /* Future implementation */
-
+#endif                         /* Future implementation */
 
 /*******************************************************************************
  *
@@ -569,37 +595,35 @@ acpi_ut_copy_epackage_to_ipackage (
  ******************************************************************************/
 
 acpi_status
-acpi_ut_copy_eobject_to_iobject (
-       union acpi_object               *external_object,
-       union acpi_operand_object       **internal_object)
+acpi_ut_copy_eobject_to_iobject(union acpi_object *external_object,
+                               union acpi_operand_object **internal_object)
 {
-       acpi_status                     status;
-
-
-       ACPI_FUNCTION_TRACE ("ut_copy_eobject_to_iobject");
+       acpi_status status;
 
+       ACPI_FUNCTION_TRACE("ut_copy_eobject_to_iobject");
 
        if (external_object->type == ACPI_TYPE_PACKAGE) {
                /*
                 * Packages as external input to control methods are not supported,
                 */
-               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                       "Packages as parameters not implemented!\n"));
+               ACPI_ERROR((AE_INFO,
+                           "Packages as parameters not implemented!"));
 
-               return_ACPI_STATUS (AE_NOT_IMPLEMENTED);
+               return_ACPI_STATUS(AE_NOT_IMPLEMENTED);
        }
 
        else {
                /*
                 * Build a simple object (no nested objects)
                 */
-               status = acpi_ut_copy_esimple_to_isimple (external_object, internal_object);
+               status =
+                   acpi_ut_copy_esimple_to_isimple(external_object,
+                                                   internal_object);
        }
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_copy_simple_object
@@ -614,84 +638,76 @@ acpi_ut_copy_eobject_to_iobject (
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ut_copy_simple_object (
-       union acpi_operand_object       *source_desc,
-       union acpi_operand_object       *dest_desc)
+static acpi_status
+acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
+                          union acpi_operand_object *dest_desc)
 {
-       u16                             reference_count;
-       union acpi_operand_object       *next_object;
-
+       u16 reference_count;
+       union acpi_operand_object *next_object;
 
        /* Save fields from destination that we don't want to overwrite */
 
        reference_count = dest_desc->common.reference_count;
        next_object = dest_desc->common.next_object;
 
-       /* Copy the entire source object over the destination object*/
+       /* Copy the entire source object over the destination object */
 
-       ACPI_MEMCPY ((char *) dest_desc, (char *) source_desc,
-                         sizeof (union acpi_operand_object));
+       ACPI_MEMCPY((char *)dest_desc, (char *)source_desc,
+                   sizeof(union acpi_operand_object));
 
        /* Restore the saved fields */
 
        dest_desc->common.reference_count = reference_count;
        dest_desc->common.next_object = next_object;
 
-       /* Handle the objects with extra data */
+       /* New object is not static, regardless of source */
 
-       switch (ACPI_GET_OBJECT_TYPE (dest_desc)) {
-       case ACPI_TYPE_BUFFER:
+       dest_desc->common.flags &= ~AOPOBJ_STATIC_POINTER;
 
-               dest_desc->buffer.node = NULL;
-               dest_desc->common.flags = source_desc->common.flags;
+       /* Handle the objects with extra data */
 
+       switch (ACPI_GET_OBJECT_TYPE(dest_desc)) {
+       case ACPI_TYPE_BUFFER:
                /*
                 * Allocate and copy the actual buffer if and only if:
                 * 1) There is a valid buffer pointer
-                * 2) The buffer is not static (not in an ACPI table) (in this case,
-                *    the actual pointer was already copied above)
+                * 2) The buffer has a length > 0
                 */
                if ((source_desc->buffer.pointer) &&
-                       (!(source_desc->common.flags & AOPOBJ_STATIC_POINTER))) {
-                       dest_desc->buffer.pointer = NULL;
-
-                       /* Create an actual buffer only if length > 0 */
-
-                       if (source_desc->buffer.length) {
-                               dest_desc->buffer.pointer =
-                                       ACPI_MEM_ALLOCATE (source_desc->buffer.length);
-                               if (!dest_desc->buffer.pointer) {
-                                       return (AE_NO_MEMORY);
-                               }
+                   (source_desc->buffer.length)) {
+                       dest_desc->buffer.pointer =
+                           ACPI_MEM_ALLOCATE(source_desc->buffer.length);
+                       if (!dest_desc->buffer.pointer) {
+                               return (AE_NO_MEMORY);
+                       }
 
-                               /* Copy the actual buffer data */
+                       /* Copy the actual buffer data */
 
-                               ACPI_MEMCPY (dest_desc->buffer.pointer,
-                                               source_desc->buffer.pointer,
-                                               source_desc->buffer.length);
-                       }
+                       ACPI_MEMCPY(dest_desc->buffer.pointer,
+                                   source_desc->buffer.pointer,
+                                   source_desc->buffer.length);
                }
                break;
 
        case ACPI_TYPE_STRING:
-
                /*
                 * Allocate and copy the actual string if and only if:
                 * 1) There is a valid string pointer
-                * 2) The string is not static (not in an ACPI table) (in this case,
-                *    the actual pointer was already copied above)
+                * (Pointer to a NULL string is allowed)
                 */
-               if ((source_desc->string.pointer) &&
-                       (!(source_desc->common.flags & AOPOBJ_STATIC_POINTER))) {
+               if (source_desc->string.pointer) {
                        dest_desc->string.pointer =
-                               ACPI_MEM_ALLOCATE ((acpi_size) source_desc->string.length + 1);
+                           ACPI_MEM_ALLOCATE((acpi_size) source_desc->string.
+                                             length + 1);
                        if (!dest_desc->string.pointer) {
                                return (AE_NO_MEMORY);
                        }
 
-                       ACPI_MEMCPY (dest_desc->string.pointer, source_desc->string.pointer,
-                                         (acpi_size) source_desc->string.length + 1);
+                       /* Copy the actual string data */
+
+                       ACPI_MEMCPY(dest_desc->string.pointer,
+                                   source_desc->string.pointer,
+                                   (acpi_size) source_desc->string.length + 1);
                }
                break;
 
@@ -700,7 +716,7 @@ acpi_ut_copy_simple_object (
                 * We copied the reference object, so we now must add a reference
                 * to the object pointed to by the reference
                 */
-               acpi_ut_add_reference (source_desc->reference.object);
+               acpi_ut_add_reference(source_desc->reference.object);
                break;
 
        default:
@@ -711,7 +727,6 @@ acpi_ut_copy_simple_object (
        return (AE_OK);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_copy_ielement_to_ielement
@@ -724,25 +739,22 @@ acpi_ut_copy_simple_object (
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ut_copy_ielement_to_ielement (
-       u8                              object_type,
-       union acpi_operand_object       *source_object,
-       union acpi_generic_state        *state,
-       void                            *context)
+static acpi_status
+acpi_ut_copy_ielement_to_ielement(u8 object_type,
+                                 union acpi_operand_object *source_object,
+                                 union acpi_generic_state *state,
+                                 void *context)
 {
-       acpi_status                     status = AE_OK;
-       u32                             this_index;
-       union acpi_operand_object       **this_target_ptr;
-       union acpi_operand_object       *target_object;
+       acpi_status status = AE_OK;
+       u32 this_index;
+       union acpi_operand_object **this_target_ptr;
+       union acpi_operand_object *target_object;
 
+       ACPI_FUNCTION_ENTRY();
 
-       ACPI_FUNCTION_ENTRY ();
-
-
-       this_index    = state->pkg.index;
+       this_index = state->pkg.index;
        this_target_ptr = (union acpi_operand_object **)
-                          &state->pkg.dest_object->package.elements[this_index];
+           &state->pkg.dest_object->package.elements[this_index];
 
        switch (object_type) {
        case ACPI_COPY_TYPE_SIMPLE:
@@ -753,34 +765,36 @@ acpi_ut_copy_ielement_to_ielement (
                        /*
                         * This is a simple object, just copy it
                         */
-                       target_object = acpi_ut_create_internal_object (
-                                          ACPI_GET_OBJECT_TYPE (source_object));
+                       target_object =
+                           acpi_ut_create_internal_object(ACPI_GET_OBJECT_TYPE
+                                                          (source_object));
                        if (!target_object) {
                                return (AE_NO_MEMORY);
                        }
 
-                       status = acpi_ut_copy_simple_object (source_object, target_object);
-                       if (ACPI_FAILURE (status)) {
+                       status =
+                           acpi_ut_copy_simple_object(source_object,
+                                                      target_object);
+                       if (ACPI_FAILURE(status)) {
                                goto error_exit;
                        }
 
                        *this_target_ptr = target_object;
-               }
-               else {
+               } else {
                        /* Pass through a null element */
 
                        *this_target_ptr = NULL;
                }
                break;
 
-
        case ACPI_COPY_TYPE_PACKAGE:
 
                /*
                 * This object is a package - go down another nesting level
                 * Create and build the package object
                 */
-               target_object = acpi_ut_create_internal_object (ACPI_TYPE_PACKAGE);
+               target_object =
+                   acpi_ut_create_internal_object(ACPI_TYPE_PACKAGE);
                if (!target_object) {
                        return (AE_NO_MEMORY);
                }
@@ -792,8 +806,8 @@ acpi_ut_copy_ielement_to_ielement (
                 * Create the object array
                 */
                target_object->package.elements =
-                       ACPI_MEM_CALLOCATE (((acpi_size) source_object->package.count + 1) *
-                                        sizeof (void *));
+                   ACPI_MEM_CALLOCATE(((acpi_size) source_object->package.
+                                       count + 1) * sizeof(void *));
                if (!target_object->package.elements) {
                        status = AE_NO_MEMORY;
                        goto error_exit;
@@ -810,19 +824,17 @@ acpi_ut_copy_ielement_to_ielement (
                *this_target_ptr = target_object;
                break;
 
-
        default:
                return (AE_BAD_PARAMETER);
        }
 
        return (status);
 
-error_exit:
-       acpi_ut_remove_reference (target_object);
+      error_exit:
+       acpi_ut_remove_reference(target_object);
        return (status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_copy_ipackage_to_ipackage
@@ -837,50 +849,47 @@ error_exit:
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ut_copy_ipackage_to_ipackage (
-       union acpi_operand_object       *source_obj,
-       union acpi_operand_object       *dest_obj,
-       struct acpi_walk_state          *walk_state)
+static acpi_status
+acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,
+                                 union acpi_operand_object *dest_obj,
+                                 struct acpi_walk_state *walk_state)
 {
-       acpi_status                     status = AE_OK;
-
+       acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE ("ut_copy_ipackage_to_ipackage");
+       ACPI_FUNCTION_TRACE("ut_copy_ipackage_to_ipackage");
 
-
-       dest_obj->common.type   = ACPI_GET_OBJECT_TYPE (source_obj);
-       dest_obj->common.flags  = source_obj->common.flags;
+       dest_obj->common.type = ACPI_GET_OBJECT_TYPE(source_obj);
+       dest_obj->common.flags = source_obj->common.flags;
        dest_obj->package.count = source_obj->package.count;
 
        /*
         * Create the object array and walk the source package tree
         */
-       dest_obj->package.elements = ACPI_MEM_CALLOCATE (
-                          ((acpi_size) source_obj->package.count + 1) *
-                          sizeof (void *));
+       dest_obj->package.elements = ACPI_MEM_CALLOCATE(((acpi_size)
+                                                        source_obj->package.
+                                                        count +
+                                                        1) * sizeof(void *));
        if (!dest_obj->package.elements) {
-               ACPI_REPORT_ERROR (
-                       ("aml_build_copy_internal_package_object: Package allocation failure\n"));
-               return_ACPI_STATUS (AE_NO_MEMORY);
+               ACPI_ERROR((AE_INFO, "Package allocation failure"));
+               return_ACPI_STATUS(AE_NO_MEMORY);
        }
 
        /*
         * Copy the package element-by-element by walking the package "tree".
         * This handles nested packages of arbitrary depth.
         */
-       status = acpi_ut_walk_package_tree (source_obj, dest_obj,
-                        acpi_ut_copy_ielement_to_ielement, walk_state);
-       if (ACPI_FAILURE (status)) {
+       status = acpi_ut_walk_package_tree(source_obj, dest_obj,
+                                          acpi_ut_copy_ielement_to_ielement,
+                                          walk_state);
+       if (ACPI_FAILURE(status)) {
                /* On failure, delete the destination package object */
 
-               acpi_ut_remove_reference (dest_obj);
+               acpi_ut_remove_reference(dest_obj);
        }
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ut_copy_iobject_to_iobject
@@ -896,35 +905,31 @@ acpi_ut_copy_ipackage_to_ipackage (
  ******************************************************************************/
 
 acpi_status
-acpi_ut_copy_iobject_to_iobject (
-       union acpi_operand_object       *source_desc,
-       union acpi_operand_object       **dest_desc,
-       struct acpi_walk_state          *walk_state)
+acpi_ut_copy_iobject_to_iobject(union acpi_operand_object *source_desc,
+                               union acpi_operand_object **dest_desc,
+                               struct acpi_walk_state *walk_state)
 {
-       acpi_status                     status = AE_OK;
-
-
-       ACPI_FUNCTION_TRACE ("ut_copy_iobject_to_iobject");
+       acpi_status status = AE_OK;
 
+       ACPI_FUNCTION_TRACE("ut_copy_iobject_to_iobject");
 
        /* Create the top level object */
 
-       *dest_desc = acpi_ut_create_internal_object (ACPI_GET_OBJECT_TYPE (source_desc));
+       *dest_desc =
+           acpi_ut_create_internal_object(ACPI_GET_OBJECT_TYPE(source_desc));
        if (!*dest_desc) {
-               return_ACPI_STATUS (AE_NO_MEMORY);
+               return_ACPI_STATUS(AE_NO_MEMORY);
        }
 
        /* Copy the object and possible subobjects */
 
-       if (ACPI_GET_OBJECT_TYPE (source_desc) == ACPI_TYPE_PACKAGE) {
-               status = acpi_ut_copy_ipackage_to_ipackage (source_desc, *dest_desc,
-                                 walk_state);
-       }
-       else {
-               status = acpi_ut_copy_simple_object (source_desc, *dest_desc);
+       if (ACPI_GET_OBJECT_TYPE(source_desc) == ACPI_TYPE_PACKAGE) {
+               status =
+                   acpi_ut_copy_ipackage_to_ipackage(source_desc, *dest_desc,
+                                                     walk_state);
+       else {
+               status = acpi_ut_copy_simple_object(source_desc, *dest_desc);
        }
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
-
-