Merge branch 'pm-core'

[linux.git] / drivers / acpi / acpica / utcopy.c

diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index 257221d452c8839262faf80465969b0ec75d8a54..98d53e59ce5522149685f07e8e0a2dd346b76e86 100644 (file)
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2015, Intel Corp.
+ * Copyright (C) 2000 - 2016, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -257,9 +257,9 @@ acpi_ut_copy_ielement_to_eelement(u8 object_type,
        ACPI_FUNCTION_ENTRY();
 
        this_index = state->pkg.index;
-       target_object = (union acpi_object *)
-           &((union acpi_object *)(state->pkg.dest_object))->package.
-           elements[this_index];
+       target_object = (union acpi_object *)&((union acpi_object *)
+                                              (state->pkg.dest_object))->
+           package.elements[this_index];
 
        switch (object_type) {
        case ACPI_COPY_TYPE_SIMPLE:
@@ -348,15 +348,15 @@ acpi_ut_copy_ipackage_to_epackage(union acpi_operand_object *internal_object,
         * 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.free_space = buffer +
+           ACPI_ROUND_UP_TO_NATIVE_WORD(sizeof(union acpi_object));
        info.object_space = 0;
        info.num_packages = 1;
 
        external_object->type = internal_object->common.type;
        external_object->package.count = internal_object->package.count;
-       external_object->package.elements = ACPI_CAST_PTR(union acpi_object,
-                                                         info.free_space);
+       external_object->package.elements =
+           ACPI_CAST_PTR(union acpi_object, info.free_space);
 
        /*
         * Leave room for an array of ACPI_OBJECTS in the buffer
@@ -593,8 +593,8 @@ acpi_ut_copy_epackage_to_ipackage(union acpi_object *external_object,
        package_elements = package_object->package.elements;
 
        /*
-        * Recursive implementation. Probably ok, since nested external packages
-        * as parameters should be very rare.
+        * Recursive implementation. Probably ok, since nested external
+        * packages as parameters should be very rare.
         */
        for (i = 0; i < external_object->package.count; i++) {
                status =
@@ -649,9 +649,8 @@ acpi_ut_copy_eobject_to_iobject(union acpi_object *external_object,
                /*
                 * 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);