1 files changed, 62 insertions, 109 deletions

diff --git a/drivers/acpi/executer/exutils.c b/drivers/acpi/executer/exutils.c
index d00b0dcba96a..1ee79d8c8f88 100644
--- a/drivers/acpi/executer/exutils.c
+++ b/drivers/acpi/executer/exutils.c
@@ -42,7 +42,6 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
-
 /*
  * DEFINE_AML_GLOBALS is tested in amlcode.h
  * to determine whether certain global names should be "defined" or only
@@ -65,15 +64,10 @@
 #include <acpi/acevents.h>
 
 #define _COMPONENT          ACPI_EXECUTER
-         ACPI_MODULE_NAME    ("exutils")
+ACPI_MODULE_NAME("exutils")
 
 /* Local prototypes */
-
-static u32
-acpi_ex_digits_needed (
-        acpi_integer                    value,
-        u32                             base);
-
+static u32 acpi_ex_digits_needed(acpi_integer value, u32 base);
 
 #ifndef ACPI_NO_METHOD_EXECUTION
 /*******************************************************************************
@@ -89,24 +83,20 @@ acpi_ex_digits_needed (
  *
  ******************************************************************************/
 
-acpi_status
-acpi_ex_enter_interpreter (
-        void)
+acpi_status acpi_ex_enter_interpreter(void)
 {
-        acpi_status                     status;
-
-        ACPI_FUNCTION_TRACE ("ex_enter_interpreter");
+        acpi_status status;
 
+        ACPI_FUNCTION_TRACE("ex_enter_interpreter");
 
-        status = acpi_ut_acquire_mutex (ACPI_MTX_EXECUTE);
-        if (ACPI_FAILURE (status)) {
-                ACPI_REPORT_ERROR (("Could not acquire interpreter mutex\n"));
+        status = acpi_ut_acquire_mutex(ACPI_MTX_EXECUTE);
+        if (ACPI_FAILURE(status)) {
+                ACPI_REPORT_ERROR(("Could not acquire interpreter mutex\n"));
         }
 
-        return_ACPI_STATUS (status);
+        return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_exit_interpreter
@@ -129,25 +119,20 @@ acpi_ex_enter_interpreter (
  *
  ******************************************************************************/
 
-void
-acpi_ex_exit_interpreter (
-        void)
+void acpi_ex_exit_interpreter(void)
 {
-        acpi_status                     status;
-
-
-        ACPI_FUNCTION_TRACE ("ex_exit_interpreter");
+        acpi_status status;
 
+        ACPI_FUNCTION_TRACE("ex_exit_interpreter");
 
-        status = acpi_ut_release_mutex (ACPI_MTX_EXECUTE);
-        if (ACPI_FAILURE (status)) {
-                ACPI_REPORT_ERROR (("Could not release interpreter mutex\n"));
+        status = acpi_ut_release_mutex(ACPI_MTX_EXECUTE);
+        if (ACPI_FAILURE(status)) {
+                ACPI_REPORT_ERROR(("Could not release interpreter mutex\n"));
         }
 
         return_VOID;
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_truncate_for32bit_table
@@ -161,20 +146,17 @@ acpi_ex_exit_interpreter (
  *
  ******************************************************************************/
 
-void
-acpi_ex_truncate_for32bit_table (
-        union acpi_operand_object       *obj_desc)
+void acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc)
 {
 
-        ACPI_FUNCTION_ENTRY ();
-
+        ACPI_FUNCTION_ENTRY();
 
         /*
          * Object must be a valid number and we must be executing
          * a control method
          */
         if ((!obj_desc) ||
-                (ACPI_GET_OBJECT_TYPE (obj_desc) != ACPI_TYPE_INTEGER)) {
+            (ACPI_GET_OBJECT_TYPE(obj_desc) != ACPI_TYPE_INTEGER)) {
                 return;
         }
 
@@ -187,7 +169,6 @@ acpi_ex_truncate_for32bit_table (
         }
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_acquire_global_lock
@@ -203,37 +184,31 @@ acpi_ex_truncate_for32bit_table (
  *
  ******************************************************************************/
 
-u8
-acpi_ex_acquire_global_lock (
-        u32                             field_flags)
+u8 acpi_ex_acquire_global_lock(u32 field_flags)
 {
-        u8                              locked = FALSE;
-        acpi_status                     status;
-
-
-        ACPI_FUNCTION_TRACE ("ex_acquire_global_lock");
+        u8 locked = FALSE;
+        acpi_status status;
 
+        ACPI_FUNCTION_TRACE("ex_acquire_global_lock");
 
         /* Only attempt lock if the always_lock bit is set */
 
         if (field_flags & AML_FIELD_LOCK_RULE_MASK) {
                 /* We should attempt to get the lock, wait forever */
 
-                status = acpi_ev_acquire_global_lock (ACPI_WAIT_FOREVER);
-                if (ACPI_SUCCESS (status)) {
+                status = acpi_ev_acquire_global_lock(ACPI_WAIT_FOREVER);
+                if (ACPI_SUCCESS(status)) {
                         locked = TRUE;
-                }
-                else {
-                        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                                "Could not acquire Global Lock, %s\n",
-                                acpi_format_exception (status)));
+                } else {
+                        ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                          "Could not acquire Global Lock, %s\n",
+                                          acpi_format_exception(status)));
                 }
         }
 
-        return_VALUE (locked);
+        return_VALUE(locked);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_release_global_lock
@@ -247,34 +222,28 @@ acpi_ex_acquire_global_lock (
  *
  ******************************************************************************/
 
-void
-acpi_ex_release_global_lock (
-        u8                              locked_by_me)
+void acpi_ex_release_global_lock(u8 locked_by_me)
 {
-        acpi_status                     status;
-
-
-        ACPI_FUNCTION_TRACE ("ex_release_global_lock");
+        acpi_status status;
 
+        ACPI_FUNCTION_TRACE("ex_release_global_lock");
 
         /* Only attempt unlock if the caller locked it */
 
         if (locked_by_me) {
                 /* OK, now release the lock */
 
-                status = acpi_ev_release_global_lock ();
-                if (ACPI_FAILURE (status)) {
+                status = acpi_ev_release_global_lock();
+                if (ACPI_FAILURE(status)) {
                         /* Report the error, but there isn't much else we can do */
 
-                        ACPI_REPORT_ERROR (("Could not release ACPI Global Lock, %s\n",
-                                acpi_format_exception (status)));
+                        ACPI_REPORT_ERROR(("Could not release ACPI Global Lock, %s\n", acpi_format_exception(status)));
                 }
         }
 
         return_VOID;
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_digits_needed
@@ -289,22 +258,17 @@ acpi_ex_release_global_lock (
  *
  ******************************************************************************/
 
-static u32
-acpi_ex_digits_needed (
-        acpi_integer                    value,
-        u32                             base)
+static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
 {
-        u32                             num_digits;
-        acpi_integer                    current_value;
-
-
-        ACPI_FUNCTION_TRACE ("ex_digits_needed");
+        u32 num_digits;
+        acpi_integer current_value;
 
+        ACPI_FUNCTION_TRACE("ex_digits_needed");
 
         /* acpi_integer is unsigned, so we don't worry about a '-' prefix */
 
         if (value == 0) {
-                return_VALUE (1);
+                return_VALUE(1);
         }
 
         current_value = value;
@@ -313,14 +277,14 @@ acpi_ex_digits_needed (
         /* Count the digits in the requested base */
 
         while (current_value) {
-                (void) acpi_ut_short_divide (current_value, base, &current_value, NULL);
+                (void)acpi_ut_short_divide(current_value, base, &current_value,
+                                           NULL);
                 num_digits++;
         }
 
-        return_VALUE (num_digits);
+        return_VALUE(num_digits);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_eisa_id_to_string
@@ -334,32 +298,26 @@ acpi_ex_digits_needed (
  *
  ******************************************************************************/
 
-void
-acpi_ex_eisa_id_to_string (
-        u32                             numeric_id,
-        char                            *out_string)
+void acpi_ex_eisa_id_to_string(u32 numeric_id, char *out_string)
 {
-        u32                             eisa_id;
-
-
-        ACPI_FUNCTION_ENTRY ();
+        u32 eisa_id;
 
+        ACPI_FUNCTION_ENTRY();
 
         /* Swap ID to big-endian to get contiguous bits */
 
-        eisa_id = acpi_ut_dword_byte_swap (numeric_id);
+        eisa_id = acpi_ut_dword_byte_swap(numeric_id);
 
-        out_string[0] = (char) ('@' + (((unsigned long) eisa_id >> 26) & 0x1f));
-        out_string[1] = (char) ('@' + ((eisa_id >> 21) & 0x1f));
-        out_string[2] = (char) ('@' + ((eisa_id >> 16) & 0x1f));
-        out_string[3] = acpi_ut_hex_to_ascii_char ((acpi_integer) eisa_id, 12);
-        out_string[4] = acpi_ut_hex_to_ascii_char ((acpi_integer) eisa_id, 8);
-        out_string[5] = acpi_ut_hex_to_ascii_char ((acpi_integer) eisa_id, 4);
-        out_string[6] = acpi_ut_hex_to_ascii_char ((acpi_integer) eisa_id, 0);
+        out_string[0] = (char)('@' + (((unsigned long)eisa_id >> 26) & 0x1f));
+        out_string[1] = (char)('@' + ((eisa_id >> 21) & 0x1f));
+        out_string[2] = (char)('@' + ((eisa_id >> 16) & 0x1f));
+        out_string[3] = acpi_ut_hex_to_ascii_char((acpi_integer) eisa_id, 12);
+        out_string[4] = acpi_ut_hex_to_ascii_char((acpi_integer) eisa_id, 8);
+        out_string[5] = acpi_ut_hex_to_ascii_char((acpi_integer) eisa_id, 4);
+        out_string[6] = acpi_ut_hex_to_ascii_char((acpi_integer) eisa_id, 0);
         out_string[7] = 0;
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ex_unsigned_integer_to_string
@@ -374,25 +332,20 @@ acpi_ex_eisa_id_to_string (
  *
  ******************************************************************************/
 
-void
-acpi_ex_unsigned_integer_to_string (
-        acpi_integer                    value,
-        char                            *out_string)
+void acpi_ex_unsigned_integer_to_string(acpi_integer value, char *out_string)
 {
-        u32                             count;
-        u32                             digits_needed;
-        u32                             remainder;
-
-
-        ACPI_FUNCTION_ENTRY ();
+        u32 count;
+        u32 digits_needed;
+        u32 remainder;
 
+        ACPI_FUNCTION_ENTRY();
 
-        digits_needed = acpi_ex_digits_needed (value, 10);
+        digits_needed = acpi_ex_digits_needed(value, 10);
         out_string[digits_needed] = 0;
 
         for (count = digits_needed; count > 0; count--) {
-                (void) acpi_ut_short_divide (value, 10, &value, &remainder);
-                out_string[count-1] = (char) ('0' + remainder);\
+                (void)acpi_ut_short_divide(value, 10, &value, &remainder);
+                out_string[count - 1] = (char)('0' + remainder);
         }
 }