1 files changed, 24 insertions, 19 deletions

diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index 424442d50b5e..861453e58555 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -90,8 +90,8 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
                  * 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);
                 }
         }
@@ -196,10 +196,10 @@ acpi_ex_resolve_operands(u16 opcode,
                          * 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);
+                                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)->
@@ -285,8 +285,8 @@ acpi_ex_resolve_operands(u16 opcode,
                 case ARGI_REF_OR_STRING:        /* Can be a String or Reference */
 
                         if ((ACPI_GET_DESCRIPTOR_TYPE(obj_desc) ==
-                             ACPI_DESC_TYPE_OPERAND)
-                            && (obj_desc->common.type == ACPI_TYPE_STRING)) {
+                             ACPI_DESC_TYPE_OPERAND) &&
+                            (obj_desc->common.type == ACPI_TYPE_STRING)) {
                                 /*
                                  * String found - the string references a named object and
                                  * must be resolved to a node
@@ -465,8 +465,9 @@ acpi_ex_resolve_operands(u16 opcode,
                          * 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);
+                        status =
+                            acpi_ex_convert_to_string(obj_desc, stack_ptr,
+                                                      ACPI_IMPLICIT_CONVERT_HEX);
                         if (ACPI_FAILURE(status)) {
                                 if (status == AE_TYPE) {
                                         ACPI_ERROR((AE_INFO,
@@ -597,8 +598,10 @@ acpi_ex_resolve_operands(u16 opcode,
 
                 case ARGI_REGION_OR_BUFFER:     /* Used by Load() only */
 
-                        /* Need an operand of type REGION or a BUFFER (which could be a resolved region field) */
-
+                        /*
+                         * Need an operand of type REGION or a BUFFER
+                         * (which could be a resolved region field)
+                         */
                         switch (obj_desc->common.type) {
                         case ACPI_TYPE_BUFFER:
                         case ACPI_TYPE_REGION:
@@ -640,9 +643,9 @@ acpi_ex_resolve_operands(u16 opcode,
 
                                 if (acpi_gbl_enable_interpreter_slack) {
                                         /*
-                                         * Enable original behavior of Store(), allowing any and all
-                                         * objects as the source operand. The ACPI spec does not
-                                         * allow this, however.
+                                         * Enable original behavior of Store(), allowing any
+                                         * and all objects as the source operand. The ACPI
+                                         * spec does not allow this, however.
                                          */
                                         break;
                                 }
@@ -655,7 +658,8 @@ acpi_ex_resolve_operands(u16 opcode,
                                 }
 
                                 ACPI_ERROR((AE_INFO,
-                                            "Needed Integer/Buffer/String/Package/Ref/Ddb], found [%s] %p",
+                                            "Needed Integer/Buffer/String/Package/Ref/Ddb]"
+                                            ", found [%s] %p",
                                             acpi_ut_get_object_type_name
                                             (obj_desc), obj_desc));
 
@@ -678,9 +682,10 @@ acpi_ex_resolve_operands(u16 opcode,
                  * Make sure that the original object was resolved to the
                  * required object type (Simple cases only).
                  */
-                status = acpi_ex_check_object_type(type_needed,
-                                                   (*stack_ptr)->common.type,
-                                                   *stack_ptr);
+                status =
+                    acpi_ex_check_object_type(type_needed,
+                                              (*stack_ptr)->common.type,
+                                              *stack_ptr);
                 if (ACPI_FAILURE(status)) {
                         return_ACPI_STATUS(status);
                 }