1 files changed, 126 insertions, 126 deletions

diff --git a/drivers/acpi/executer/exfield.c b/drivers/acpi/executer/exfield.c
index a690c9250990..ab1ba399aa28 100644
--- a/drivers/acpi/executer/exfield.c
+++ b/drivers/acpi/executer/exfield.c
@@ -41,15 +41,12 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 #include <acpi/acpi.h>
 #include <acpi/acdispat.h>
 #include <acpi/acinterp.h>
 
-
 #define _COMPONENT          ACPI_EXECUTER
-         ACPI_MODULE_NAME    ("exfield")
-
+ACPI_MODULE_NAME("exfield")
 
 /*******************************************************************************
  *
@@ -65,67 +62,70 @@
  *              Buffer, depending on the size of the field.
  *
  ******************************************************************************/
-
 acpi_status
-acpi_ex_read_data_from_field (
-        struct acpi_walk_state          *walk_state,
-        union acpi_operand_object       *obj_desc,
-        union acpi_operand_object       **ret_buffer_desc)
+acpi_ex_read_data_from_field(struct acpi_walk_state *walk_state,
+                             union acpi_operand_object *obj_desc,
+                             union acpi_operand_object **ret_buffer_desc)
 {
-        acpi_status                     status;
-        union acpi_operand_object       *buffer_desc;
-        acpi_size                       length;
-        void                            *buffer;
-        u8                              locked;
-
-
-        ACPI_FUNCTION_TRACE_PTR ("ex_read_data_from_field", obj_desc);
+        acpi_status status;
+        union acpi_operand_object *buffer_desc;
+        acpi_size length;
+        void *buffer;
+        u8 locked;
 
+        ACPI_FUNCTION_TRACE_PTR("ex_read_data_from_field", obj_desc);
 
         /* Parameter validation */
 
         if (!obj_desc) {
-                return_ACPI_STATUS (AE_AML_NO_OPERAND);
+                return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
         if (!ret_buffer_desc) {
-                return_ACPI_STATUS (AE_BAD_PARAMETER);
+                return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
 
-        if (ACPI_GET_OBJECT_TYPE (obj_desc) == ACPI_TYPE_BUFFER_FIELD) {
+        if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_BUFFER_FIELD) {
                 /*
                  * If the buffer_field arguments have not been previously evaluated,
                  * evaluate them now and save the results.
                  */
                 if (!(obj_desc->common.flags & AOPOBJ_DATA_VALID)) {
-                        status = acpi_ds_get_buffer_field_arguments (obj_desc);
-                        if (ACPI_FAILURE (status)) {
-                                return_ACPI_STATUS (status);
+                        status = acpi_ds_get_buffer_field_arguments(obj_desc);
+                        if (ACPI_FAILURE(status)) {
+                                return_ACPI_STATUS(status);
                         }
                 }
-        }
-        else if ((ACPI_GET_OBJECT_TYPE (obj_desc) == ACPI_TYPE_LOCAL_REGION_FIELD) &&
-                         (obj_desc->field.region_obj->region.space_id == ACPI_ADR_SPACE_SMBUS)) {
+        } else
+            if ((ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_LOCAL_REGION_FIELD)
+                && (obj_desc->field.region_obj->region.space_id ==
+                    ACPI_ADR_SPACE_SMBUS)) {
                 /*
                  * This is an SMBus read.  We must create a buffer to hold the data
                  * and directly access the region handler.
                  */
-                buffer_desc = acpi_ut_create_buffer_object (ACPI_SMBUS_BUFFER_SIZE);
+                buffer_desc =
+                    acpi_ut_create_buffer_object(ACPI_SMBUS_BUFFER_SIZE);
                 if (!buffer_desc) {
-                        return_ACPI_STATUS (AE_NO_MEMORY);
+                        return_ACPI_STATUS(AE_NO_MEMORY);
                 }
 
                 /* Lock entire transaction if requested */
 
-                locked = acpi_ex_acquire_global_lock (obj_desc->common_field.field_flags);
+                locked =
+                    acpi_ex_acquire_global_lock(obj_desc->common_field.
+                                                field_flags);
 
                 /*
                  * Perform the read.
                  * Note: Smbus protocol value is passed in upper 16-bits of Function
                  */
-                status = acpi_ex_access_region (obj_desc, 0,
-                                 ACPI_CAST_PTR (acpi_integer, buffer_desc->buffer.pointer),
-                                 ACPI_READ | (obj_desc->field.attribute << 16));
-                acpi_ex_release_global_lock (locked);
+                status = acpi_ex_access_region(obj_desc, 0,
+                                               ACPI_CAST_PTR(acpi_integer,
+                                                             buffer_desc->
+                                                             buffer.pointer),
+                                               ACPI_READ | (obj_desc->field.
+                                                            attribute << 16));
+                acpi_ex_release_global_lock(locked);
                 goto exit;
         }
 
@@ -139,22 +139,22 @@ acpi_ex_read_data_from_field (
          *
          * Note: Field.length is in bits.
          */
-        length = (acpi_size) ACPI_ROUND_BITS_UP_TO_BYTES (obj_desc->field.bit_length);
+        length =
+            (acpi_size) ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->field.bit_length);
         if (length > acpi_gbl_integer_byte_width) {
                 /* Field is too large for an Integer, create a Buffer instead */
 
-                buffer_desc = acpi_ut_create_buffer_object (length);
+                buffer_desc = acpi_ut_create_buffer_object(length);
                 if (!buffer_desc) {
-                        return_ACPI_STATUS (AE_NO_MEMORY);
+                        return_ACPI_STATUS(AE_NO_MEMORY);
                 }
                 buffer = buffer_desc->buffer.pointer;
-        }
-        else {
+        } else {
                 /* Field will fit within an Integer (normal case) */
 
-                buffer_desc = acpi_ut_create_internal_object (ACPI_TYPE_INTEGER);
+                buffer_desc = acpi_ut_create_internal_object(ACPI_TYPE_INTEGER);
                 if (!buffer_desc) {
-                        return_ACPI_STATUS (AE_NO_MEMORY);
+                        return_ACPI_STATUS(AE_NO_MEMORY);
                 }
 
                 length = acpi_gbl_integer_byte_width;
@@ -162,37 +162,36 @@ acpi_ex_read_data_from_field (
                 buffer = &buffer_desc->integer.value;
         }
 
-        ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD,
-                "field_read [TO]:  Obj %p, Type %X, Buf %p, byte_len %X\n",
-                obj_desc, ACPI_GET_OBJECT_TYPE (obj_desc), buffer, (u32) length));
-        ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD,
-                "field_read [FROM]: bit_len %X, bit_off %X, byte_off %X\n",
-                obj_desc->common_field.bit_length,
-                obj_desc->common_field.start_field_bit_offset,
-                obj_desc->common_field.base_byte_offset));
+        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
+                          "field_read [TO]:  Obj %p, Type %X, Buf %p, byte_len %X\n",
+                          obj_desc, ACPI_GET_OBJECT_TYPE(obj_desc), buffer,
+                          (u32) length));
+        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
+                          "field_read [FROM]: bit_len %X, bit_off %X, byte_off %X\n",
+                          obj_desc->common_field.bit_length,
+                          obj_desc->common_field.start_field_bit_offset,
+                          obj_desc->common_field.base_byte_offset));
 
         /* Lock entire transaction if requested */
 
-        locked = acpi_ex_acquire_global_lock (obj_desc->common_field.field_flags);
+        locked =
+            acpi_ex_acquire_global_lock(obj_desc->common_field.field_flags);
 
         /* Read from the field */
 
-        status = acpi_ex_extract_from_field (obj_desc, buffer, (u32) length);
-        acpi_ex_release_global_lock (locked);
-
+        status = acpi_ex_extract_from_field(obj_desc, buffer, (u32) length);
+        acpi_ex_release_global_lock(locked);
 
-exit:
-        if (ACPI_FAILURE (status)) {
-                acpi_ut_remove_reference (buffer_desc);
-        }
-        else {
+      exit:
+        if (ACPI_FAILURE(status)) {
+                acpi_ut_remove_reference(buffer_desc);
+        } else {
                 *ret_buffer_desc = buffer_desc;
         }
 
-        return_ACPI_STATUS (status);
+        return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_write_data_to_field
@@ -208,97 +207,96 @@ exit:
  ******************************************************************************/
 
 acpi_status
-acpi_ex_write_data_to_field (
-        union acpi_operand_object       *source_desc,
-        union acpi_operand_object       *obj_desc,
-        union acpi_operand_object       **result_desc)
+acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
+                            union acpi_operand_object *obj_desc,
+                            union acpi_operand_object **result_desc)
 {
-        acpi_status                     status;
-        u32                             length;
-        u32                             required_length;
-        void                            *buffer;
-        void                            *new_buffer;
-        u8                              locked;
-        union acpi_operand_object       *buffer_desc;
-
-
-        ACPI_FUNCTION_TRACE_PTR ("ex_write_data_to_field", obj_desc);
+        acpi_status status;
+        u32 length;
+        u32 required_length;
+        void *buffer;
+        void *new_buffer;
+        u8 locked;
+        union acpi_operand_object *buffer_desc;
 
+        ACPI_FUNCTION_TRACE_PTR("ex_write_data_to_field", obj_desc);
 
         /* Parameter validation */
 
         if (!source_desc || !obj_desc) {
-                return_ACPI_STATUS (AE_AML_NO_OPERAND);
+                return_ACPI_STATUS(AE_AML_NO_OPERAND);
         }
 
-        if (ACPI_GET_OBJECT_TYPE (obj_desc) == ACPI_TYPE_BUFFER_FIELD) {
+        if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_BUFFER_FIELD) {
                 /*
                  * If the buffer_field arguments have not been previously evaluated,
                  * evaluate them now and save the results.
                  */
                 if (!(obj_desc->common.flags & AOPOBJ_DATA_VALID)) {
-                        status = acpi_ds_get_buffer_field_arguments (obj_desc);
-                        if (ACPI_FAILURE (status)) {
-                                return_ACPI_STATUS (status);
+                        status = acpi_ds_get_buffer_field_arguments(obj_desc);
+                        if (ACPI_FAILURE(status)) {
+                                return_ACPI_STATUS(status);
                         }
                 }
-        }
-        else if ((ACPI_GET_OBJECT_TYPE (obj_desc) == ACPI_TYPE_LOCAL_REGION_FIELD) &&
-                         (obj_desc->field.region_obj->region.space_id == ACPI_ADR_SPACE_SMBUS)) {
+        } else
+            if ((ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_LOCAL_REGION_FIELD)
+                && (obj_desc->field.region_obj->region.space_id ==
+                    ACPI_ADR_SPACE_SMBUS)) {
                 /*
                  * This is an SMBus write.  We will bypass the entire field mechanism
                  * and handoff the buffer directly to the handler.
                  *
                  * Source must be a buffer of sufficient size (ACPI_SMBUS_BUFFER_SIZE).
                  */
-                if (ACPI_GET_OBJECT_TYPE (source_desc) != ACPI_TYPE_BUFFER) {
-                        ACPI_REPORT_ERROR (("SMBus write requires Buffer, found type %s\n",
-                                acpi_ut_get_object_type_name (source_desc)));
+                if (ACPI_GET_OBJECT_TYPE(source_desc) != ACPI_TYPE_BUFFER) {
+                        ACPI_REPORT_ERROR(("SMBus write requires Buffer, found type %s\n", acpi_ut_get_object_type_name(source_desc)));
 
-                        return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                        return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
                 }
 
                 if (source_desc->buffer.length < ACPI_SMBUS_BUFFER_SIZE) {
-                        ACPI_REPORT_ERROR ((
-                                "SMBus write requires Buffer of length %X, found length %X\n",
-                                ACPI_SMBUS_BUFFER_SIZE, source_desc->buffer.length));
+                        ACPI_REPORT_ERROR(("SMBus write requires Buffer of length %X, found length %X\n", ACPI_SMBUS_BUFFER_SIZE, source_desc->buffer.length));
 
-                        return_ACPI_STATUS (AE_AML_BUFFER_LIMIT);
+                        return_ACPI_STATUS(AE_AML_BUFFER_LIMIT);
                 }
 
-                buffer_desc = acpi_ut_create_buffer_object (ACPI_SMBUS_BUFFER_SIZE);
+                buffer_desc =
+                    acpi_ut_create_buffer_object(ACPI_SMBUS_BUFFER_SIZE);
                 if (!buffer_desc) {
-                        return_ACPI_STATUS (AE_NO_MEMORY);
+                        return_ACPI_STATUS(AE_NO_MEMORY);
                 }
 
                 buffer = buffer_desc->buffer.pointer;
-                ACPI_MEMCPY (buffer, source_desc->buffer.pointer,
-                        ACPI_SMBUS_BUFFER_SIZE);
+                ACPI_MEMCPY(buffer, source_desc->buffer.pointer,
+                            ACPI_SMBUS_BUFFER_SIZE);
 
                 /* Lock entire transaction if requested */
 
-                locked = acpi_ex_acquire_global_lock (obj_desc->common_field.field_flags);
+                locked =
+                    acpi_ex_acquire_global_lock(obj_desc->common_field.
+                                                field_flags);
 
                 /*
                  * Perform the write (returns status and perhaps data in the
                  * same buffer)
                  * Note: SMBus protocol type is passed in upper 16-bits of Function.
                  */
-                status = acpi_ex_access_region (obj_desc, 0,
-                                  (acpi_integer *) buffer,
-                                  ACPI_WRITE | (obj_desc->field.attribute << 16));
-                acpi_ex_release_global_lock (locked);
+                status = acpi_ex_access_region(obj_desc, 0,
+                                               (acpi_integer *) buffer,
+                                               ACPI_WRITE | (obj_desc->field.
+                                                             attribute << 16));
+                acpi_ex_release_global_lock(locked);
 
                 *result_desc = buffer_desc;
-                return_ACPI_STATUS (status);
+                return_ACPI_STATUS(status);
         }
 
         /* Get a pointer to the data to be written */
 
-        switch (ACPI_GET_OBJECT_TYPE (source_desc)) {
+        switch (ACPI_GET_OBJECT_TYPE(source_desc)) {
         case ACPI_TYPE_INTEGER:
                 buffer = &source_desc->integer.value;
-                length = sizeof (source_desc->integer.value);
+                length = sizeof(source_desc->integer.value);
                 break;
 
         case ACPI_TYPE_BUFFER:
@@ -312,7 +310,7 @@ acpi_ex_write_data_to_field (
                 break;
 
         default:
-                return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+                return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
         }
 
         /*
@@ -322,15 +320,15 @@ acpi_ex_write_data_to_field (
          * the ACPI specification.
          */
         new_buffer = NULL;
-        required_length = ACPI_ROUND_BITS_UP_TO_BYTES (
-                           obj_desc->common_field.bit_length);
+        required_length =
+            ACPI_ROUND_BITS_UP_TO_BYTES(obj_desc->common_field.bit_length);
 
         if (length < required_length) {
                 /* We need to create a new buffer */
 
-                new_buffer = ACPI_MEM_CALLOCATE (required_length);
+                new_buffer = ACPI_MEM_CALLOCATE(required_length);
                 if (!new_buffer) {
-                        return_ACPI_STATUS (AE_NO_MEMORY);
+                        return_ACPI_STATUS(AE_NO_MEMORY);
                 }
 
                 /*
@@ -338,40 +336,42 @@ acpi_ex_write_data_to_field (
                  * at Byte zero.  All unused (upper) bytes of the
                  * buffer will be 0.
                  */
-                ACPI_MEMCPY ((char *) new_buffer, (char *) buffer, length);
+                ACPI_MEMCPY((char *)new_buffer, (char *)buffer, length);
                 buffer = new_buffer;
                 length = required_length;
         }
 
-        ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD,
-                "field_write [FROM]: Obj %p (%s:%X), Buf %p, byte_len %X\n",
-                source_desc, acpi_ut_get_type_name (ACPI_GET_OBJECT_TYPE (source_desc)),
-                ACPI_GET_OBJECT_TYPE (source_desc), buffer, length));
-
-        ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD,
-                "field_write [TO]:  Obj %p (%s:%X), bit_len %X, bit_off %X, byte_off %X\n",
-                obj_desc, acpi_ut_get_type_name (ACPI_GET_OBJECT_TYPE (obj_desc)),
-                ACPI_GET_OBJECT_TYPE (obj_desc),
-                obj_desc->common_field.bit_length,
-                obj_desc->common_field.start_field_bit_offset,
-                obj_desc->common_field.base_byte_offset));
+        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
+                          "field_write [FROM]: Obj %p (%s:%X), Buf %p, byte_len %X\n",
+                          source_desc,
+                          acpi_ut_get_type_name(ACPI_GET_OBJECT_TYPE
+                                                (source_desc)),
+                          ACPI_GET_OBJECT_TYPE(source_desc), buffer, length));
+
+        ACPI_DEBUG_PRINT((ACPI_DB_BFIELD,
+                          "field_write [TO]:  Obj %p (%s:%X), bit_len %X, bit_off %X, byte_off %X\n",
+                          obj_desc,
+                          acpi_ut_get_type_name(ACPI_GET_OBJECT_TYPE(obj_desc)),
+                          ACPI_GET_OBJECT_TYPE(obj_desc),
+                          obj_desc->common_field.bit_length,
+                          obj_desc->common_field.start_field_bit_offset,
+                          obj_desc->common_field.base_byte_offset));
 
         /* Lock entire transaction if requested */
 
-        locked = acpi_ex_acquire_global_lock (obj_desc->common_field.field_flags);
+        locked =
+            acpi_ex_acquire_global_lock(obj_desc->common_field.field_flags);
 
         /* Write to the field */
 
-        status = acpi_ex_insert_into_field (obj_desc, buffer, length);
-        acpi_ex_release_global_lock (locked);
+        status = acpi_ex_insert_into_field(obj_desc, buffer, length);
+        acpi_ex_release_global_lock(locked);
 
         /* Free temporary buffer if we used one */
 
         if (new_buffer) {
-                ACPI_MEM_FREE (new_buffer);
+                ACPI_MEM_FREE(new_buffer);
         }
 
-        return_ACPI_STATUS (status);
+        return_ACPI_STATUS(status);
 }
-
-