23 files changed, 47 insertions, 52 deletions

diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 421b048f6640..5ce06935d9de 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -678,6 +678,7 @@ struct acpi_opcode_info {
 };
 
 /* Value associated with the parse object */
+
 union acpi_parse_value {
         u64 integer;            /* Integer constant (Up to 64 bits) */
         u32 size;               /* bytelist or field size */
diff --git a/drivers/acpi/acpica/evxface.c b/drivers/acpi/acpica/evxface.c
index 76cfe71c6b28..db820600b503 100644
--- a/drivers/acpi/acpica/evxface.c
+++ b/drivers/acpi/acpica/evxface.c
@@ -249,6 +249,7 @@ acpi_remove_notify_handler(acpi_handle device,
             (handler_type > ACPI_MAX_NOTIFY_HANDLER_TYPE)) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
         }
+
         /* Make sure all deferred notify tasks are completed */
 
         acpi_os_wait_events_complete();
@@ -622,12 +623,12 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
                 goto free_and_exit;
         }
 
-
         handler->address = address;
         handler->context = context;
         handler->method_node = gpe_event_info->dispatch.method_node;
-        handler->original_flags = gpe_event_info->flags &
-                        (ACPI_GPE_XRUPT_TYPE_MASK | ACPI_GPE_DISPATCH_MASK);
+        handler->original_flags = (u8)(gpe_event_info->flags &
+                                       (ACPI_GPE_XRUPT_TYPE_MASK |
+                                        ACPI_GPE_DISPATCH_MASK));
 
         /*
          * If the GPE is associated with a method, it may have been enabled
@@ -746,10 +747,10 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
          * enabled, it should be enabled at this point to restore the
          * post-initialization configuration.
          */
-
-        if ((handler->original_flags & ACPI_GPE_DISPATCH_METHOD)
-            && handler->originally_enabled)
+        if ((handler->original_flags & ACPI_GPE_DISPATCH_METHOD) &&
+            handler->originally_enabled) {
                 (void)acpi_ev_add_gpe_reference(gpe_event_info);
+        }
 
         /* Now we can free the handler object */
 
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c
index ee6e96c9835a..be57f49dafbd 100644
--- a/drivers/acpi/acpica/evxfevnt.c
+++ b/drivers/acpi/acpica/evxfevnt.c
@@ -61,7 +61,6 @@ ACPI_MODULE_NAME("evxfevnt")
  * DESCRIPTION: Transfers the system into ACPI mode.
  *
  ******************************************************************************/
-
 acpi_status acpi_enable(void)
 {
         acpi_status status;
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index d8095c1bda11..36f8ad87670b 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -172,6 +172,7 @@ acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number)
         acpi_os_release_lock(acpi_gbl_gpe_lock, flags);
         return_ACPI_STATUS(status);
 }
+
 ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
 
 
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 9ad64204495e..b4f42f56fc34 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -125,7 +125,6 @@ acpi_ex_add_table(u32 table_index,
          * responsible for discovering any new wake GPEs by running _PRW methods
          * that may have been loaded by this table.
          */
-
         status = acpi_tb_get_owner_id(table_index, &owner_id);
         if (ACPI_SUCCESS(status)) {
                 acpi_ev_update_gpes(owner_id);
diff --git a/drivers/acpi/acpica/exmutex.c b/drivers/acpi/acpica/exmutex.c
index 900a25155331..02157ef486dd 100644
--- a/drivers/acpi/acpica/exmutex.c
+++ b/drivers/acpi/acpica/exmutex.c
@@ -378,6 +378,7 @@ acpi_ex_release_mutex(union acpi_operand_object *obj_desc,
         }
 
         /* Must have a valid thread ID */
+
         if (!walk_state->thread) {
                 ACPI_ERROR((AE_INFO,
                             "Cannot release Mutex [%4.4s], null thread info",
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index bbf01e9bf057..cf50c6c6d926 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -948,13 +948,7 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                          */
                                         return_desc =
                                             acpi_ut_create_integer_object((u64)
-                                                                          temp_desc->
-                                                                          buffer.
-                                                                          pointer
-                                                                          [operand
-                                                                           [0]->
-                                                                           reference.
-                                                                           value]);
+                                                                          temp_desc->buffer.pointer[operand[0]->reference.value]);
                                         if (!return_desc) {
                                                 status = AE_NO_MEMORY;
                                                 goto cleanup;
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 044d44141be6..06a49245f410 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -162,7 +162,6 @@ acpi_ex_system_memory_space_handler(u32 function,
                  */
                 page_boundary_map_length =
                     ACPI_ROUND_UP(address, ACPI_DEFAULT_PAGE_SIZE) - address;
-
                 if (page_boundary_map_length == 0) {
                         page_boundary_map_length = ACPI_DEFAULT_PAGE_SIZE;
                 }
@@ -240,19 +239,19 @@ acpi_ex_system_memory_space_handler(u32 function,
 
                 switch (bit_width) {
                 case 8:
-                        ACPI_SET8(logical_addr_ptr) = (u8) * value;
+                        ACPI_SET8(logical_addr_ptr) = (u8)*value;
                         break;
 
                 case 16:
-                        ACPI_SET16(logical_addr_ptr) = (u16) * value;
+                        ACPI_SET16(logical_addr_ptr) = (u16)*value;
                         break;
 
                 case 32:
-                        ACPI_SET32(logical_addr_ptr) = (u32) * value;
+                        ACPI_SET32(logical_addr_ptr) = (u32)*value;
                         break;
 
                 case 64:
-                        ACPI_SET64(logical_addr_ptr) = (u64) * value;
+                        ACPI_SET64(logical_addr_ptr) = (u64)*value;
                         break;
 
                 default:
diff --git a/drivers/acpi/acpica/hwacpi.c b/drivers/acpi/acpica/hwacpi.c
index 90a9aea1cee9..effa2b0a5932 100644
--- a/drivers/acpi/acpica/hwacpi.c
+++ b/drivers/acpi/acpica/hwacpi.c
@@ -108,8 +108,7 @@ acpi_status acpi_hw_set_mode(u32 mode)
                  * enable bits to default
                  */
                 status = acpi_hw_write_port(acpi_gbl_FADT.smi_command,
-                                            (u32) acpi_gbl_FADT.acpi_disable,
-                                            8);
+                                            (u32)acpi_gbl_FADT.acpi_disable, 8);
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                   "Attempting to enable Legacy (non-ACPI) mode\n"));
                 break;
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index e782b5a22fe5..fd4e2dc2c641 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -363,8 +363,7 @@ acpi_status acpi_hw_write_pm1_control(u32 pm1a_control, u32 pm1b_control)
  * DESCRIPTION: Read from the specified ACPI register
  *
  ******************************************************************************/
-acpi_status
-acpi_hw_register_read(u32 register_id, u32 * return_value)
+acpi_status acpi_hw_register_read(u32 register_id, u32 *return_value)
 {
         u32 value = 0;
         acpi_status status;
diff --git a/drivers/acpi/acpica/nsrepair2.c b/drivers/acpi/acpica/nsrepair2.c
index 90189251cdf0..fdb818d72a07 100644
--- a/drivers/acpi/acpica/nsrepair2.c
+++ b/drivers/acpi/acpica/nsrepair2.c
@@ -55,7 +55,8 @@ ACPI_MODULE_NAME("nsrepair2")
  */
 typedef
 acpi_status(*acpi_repair_function) (struct acpi_predefined_data *data,
-                                    union acpi_operand_object **return_object_ptr);
+                                    union acpi_operand_object
+                                    **return_object_ptr);
 
 typedef struct acpi_repair_info {
         char name[ACPI_NAME_SIZE];
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index 479aad0dbf41..7e8bd2af806d 100644
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -111,7 +111,7 @@ acpi_ns_print_node_pathname(struct acpi_namespace_node *node,
 u8 acpi_ns_valid_root_prefix(char prefix)
 {
 
-        return ((u8) (prefix == '\\'));
+        return ((u8)(prefix == '\\'));
 }
 
 /*******************************************************************************
@@ -129,7 +129,7 @@ u8 acpi_ns_valid_root_prefix(char prefix)
 static u8 acpi_ns_valid_path_separator(char sep)
 {
 
-        return ((u8) (sep == '.'));
+        return ((u8)(sep == '.'));
 }
 
 /*******************************************************************************
@@ -673,7 +673,7 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
                 return_UINT32(ACPI_NS_NORMAL);
         }
 
-        return_UINT32(((u32) acpi_gbl_ns_properties[type]) & ACPI_NS_NEWSCOPE);
+        return_UINT32(((u32)acpi_gbl_ns_properties[type]) & ACPI_NS_NEWSCOPE);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c
index 5c05ba3bc0d5..a5d8ccce10fd 100644
--- a/drivers/acpi/acpica/nsxfeval.c
+++ b/drivers/acpi/acpica/nsxfeval.c
@@ -606,7 +606,9 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
                         for (i = 0; i < cid->count; i++) {
                                 if (ACPI_STRCMP(cid->ids[i].string, info->hid)
                                     == 0) {
+
                                         /* Found a matching CID */
+
                                         found = TRUE;
                                         break;
                                 }
diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c
index 4137dcb352d1..afefb3a1b577 100644
--- a/drivers/acpi/acpica/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -206,7 +206,7 @@ u8 acpi_ps_is_leading_char(u32 c)
  */
 u8 acpi_ps_is_prefix_char(u32 c)
 {
-        return ((u8) (c == '\\' || c == '^'));
+        return ((u8)(c == '\\' || c == '^'));
 }
 
 /*
diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index 311cbc4f05fa..81333264e992 100644
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -480,8 +480,7 @@ acpi_rs_create_aml_resources(struct acpi_resource *linked_list_buffer,
         status = acpi_rs_get_aml_length(linked_list_buffer, &aml_size_needed);
 
         ACPI_DEBUG_PRINT((ACPI_DB_INFO, "AmlSizeNeeded=%X, %s\n",
-                          (u32) aml_size_needed,
-                          acpi_format_exception(status)));
+                          (u32)aml_size_needed, acpi_format_exception(status)));
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
diff --git a/drivers/acpi/acpica/rsdump.c b/drivers/acpi/acpica/rsdump.c
index 4d11b072388c..276e52f2236d 100644
--- a/drivers/acpi/acpica/rsdump.c
+++ b/drivers/acpi/acpica/rsdump.c
@@ -654,7 +654,8 @@ acpi_rs_dump_descriptor(void *resource, struct acpi_rsdump_info *table)
                         /*
                          * Optional resource_source for Address resources
                          */
-                        acpi_rs_dump_resource_source(ACPI_CAST_PTR(struct
+                        acpi_rs_dump_resource_source(ACPI_CAST_PTR
+                                                     (struct
                                                                    acpi_resource_source,
                                                                    target));
                         break;
diff --git a/drivers/acpi/acpica/rsirq.c b/drivers/acpi/acpica/rsirq.c
index e23a9ec248cb..a718eca8e825 100644
--- a/drivers/acpi/acpica/rsirq.c
+++ b/drivers/acpi/acpica/rsirq.c
@@ -212,15 +212,13 @@ struct acpi_rsconvert_info acpi_rs_convert_ext_irq[9] = {
 
         {ACPI_RSC_COUNT, ACPI_RS_OFFSET(data.extended_irq.interrupt_count),
          AML_OFFSET(extended_irq.interrupt_count),
-         sizeof(u32)}
-        ,
+         sizeof(u32)},
 
         /* Copy every IRQ in the table, each is 32 bits */
 
         {ACPI_RSC_MOVE32, ACPI_RS_OFFSET(data.extended_irq.interrupts[0]),
          AML_OFFSET(extended_irq.interrupts[0]),
-         0}
-        ,
+         0},
 
         /* Optional resource_source (Index and String) */
 
diff --git a/drivers/acpi/acpica/rsmemory.c b/drivers/acpi/acpica/rsmemory.c
index 4fd611ad02b4..d446103a61cb 100644
--- a/drivers/acpi/acpica/rsmemory.c
+++ b/drivers/acpi/acpica/rsmemory.c
@@ -156,8 +156,7 @@ struct acpi_rsconvert_info acpi_rs_get_vendor_small[3] = {
 
         {ACPI_RSC_COUNT16, ACPI_RS_OFFSET(data.vendor.byte_length),
          0,
-         sizeof(u8)}
-        ,
+         sizeof(u8)},
 
         /* Vendor data */
 
@@ -181,8 +180,7 @@ struct acpi_rsconvert_info acpi_rs_get_vendor_large[3] = {
 
         {ACPI_RSC_COUNT16, ACPI_RS_OFFSET(data.vendor.byte_length),
          0,
-         sizeof(u8)}
-        ,
+         sizeof(u8)},
 
         /* Vendor data */
 
diff --git a/drivers/acpi/acpica/rsmisc.c b/drivers/acpi/acpica/rsmisc.c
index c6f291c2bc83..3d0e15cd1276 100644
--- a/drivers/acpi/acpica/rsmisc.c
+++ b/drivers/acpi/acpica/rsmisc.c
@@ -159,7 +159,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                 case ACPI_RSC_COUNT:
 
                         item_count = ACPI_GET8(source);
-                        ACPI_SET8(destination) = (u8) item_count;
+                        ACPI_SET8(destination) = (u8)item_count;
 
                         resource->length = resource->length +
                             (info->value * (item_count - 1));
@@ -385,7 +385,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                         }
 
                         target = ACPI_ADD_PTR(char, resource, info->value);
-                        ACPI_SET8(target) = (u8) item_count;
+                        ACPI_SET8(target) = (u8)item_count;
                         break;
 
                 case ACPI_RSC_BITMASK16:
@@ -401,7 +401,7 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                         }
 
                         target = ACPI_ADD_PTR(char, resource, info->value);
-                        ACPI_SET8(target) = (u8) item_count;
+                        ACPI_SET8(target) = (u8)item_count;
                         break;
 
                 case ACPI_RSC_EXIT_NE:
@@ -544,7 +544,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                 case ACPI_RSC_COUNT:
 
                         item_count = ACPI_GET8(source);
-                        ACPI_SET8(destination) = (u8) item_count;
+                        ACPI_SET8(destination) = (u8)item_count;
 
                         aml_length =
                             (u16) (aml_length +
@@ -686,7 +686,8 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                          * Optional resource_source (Index and String)
                          */
                         aml_length =
-                            acpi_rs_set_resource_source(aml, (acpi_rs_length)
+                            acpi_rs_set_resource_source(aml,
+                                                        (acpi_rs_length)
                                                         aml_length, source);
                         acpi_rs_set_resource_length(aml_length, aml);
                         break;
diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c
index 37d5241c0acf..441447f238f0 100644
--- a/drivers/acpi/acpica/rsutils.c
+++ b/drivers/acpi/acpica/rsutils.c
@@ -358,8 +358,10 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,
                  *
                  * Zero the entire area of the buffer.
                  */
-                total_length = (u32)
-                ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) + 1;
+                total_length =
+                    (u32)
+                    ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) +
+                    1;
                 total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length);
 
                 ACPI_MEMSET(resource_source->string_ptr, 0, total_length);
diff --git a/drivers/acpi/acpica/uteval.c b/drivers/acpi/acpica/uteval.c
index a9c65fbea5f4..45cddb8b1101 100644
--- a/drivers/acpi/acpica/uteval.c
+++ b/drivers/acpi/acpica/uteval.c
@@ -68,7 +68,7 @@ ACPI_MODULE_NAME("uteval")
  ******************************************************************************/
 
 acpi_status
-acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
+acpi_ut_evaluate_object(struct acpi_namespace_node * prefix_node,
                         char *path,
                         u32 expected_return_btypes,
                         union acpi_operand_object **return_desc)
diff --git a/drivers/acpi/acpica/utglobal.c b/drivers/acpi/acpica/utglobal.c
index 4080088f937c..c083611c76a6 100644
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
@@ -373,6 +373,7 @@ acpi_status acpi_ut_init_globals(void)
 }
 
 /* Public globals */
+
 ACPI_EXPORT_SYMBOL(acpi_gbl_FADT)
 ACPI_EXPORT_SYMBOL(acpi_dbg_level)
 ACPI_EXPORT_SYMBOL(acpi_dbg_layer)
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c
index e38bef4980bc..7d0a1b5dedff 100644
--- a/drivers/acpi/acpica/utresrc.c
+++ b/drivers/acpi/acpica/utresrc.c
@@ -412,7 +412,7 @@ static const u8 acpi_gbl_resource_types[] = {
  ******************************************************************************/
 
 acpi_status
-acpi_ut_walk_aml_resources(u8 * aml,
+acpi_ut_walk_aml_resources(u8 *aml,
                            acpi_size aml_length,
                            acpi_walk_aml_callback user_function, void **context)
 {
@@ -525,7 +525,7 @@ acpi_ut_walk_aml_resources(u8 * aml,
  *
  ******************************************************************************/
 
-acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index)
+acpi_status acpi_ut_validate_resource(void *aml, u8 *return_index)
 {
         union aml_resource *aml_resource;
         u8 resource_type;
@@ -800,8 +800,7 @@ u32 acpi_ut_get_descriptor_length(void *aml)
  ******************************************************************************/
 
 acpi_status
-acpi_ut_get_resource_end_tag(union acpi_operand_object * obj_desc,
-                             u8 ** end_tag)
+acpi_ut_get_resource_end_tag(union acpi_operand_object *obj_desc, u8 **end_tag)
 {
         acpi_status status;