9 files changed, 48 insertions, 0 deletions

diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index c9ac05c4685f..c8d9752e3128 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.c
@@ -260,12 +260,14 @@ u32 acpi_ev_fixed_event_detect(void)
          * Check for all possible Fixed Events and dispatch those that are active
          */
         for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
+
                 /* Both the status and enable bits must be on for this event */
 
                 if ((fixed_status & acpi_gbl_fixed_event_info[i].
                      status_bit_mask)
                     && (fixed_enable & acpi_gbl_fixed_event_info[i].
                         enable_bit_mask)) {
+
                         /* Found an active (signalled) event */
 
                         int_status |= acpi_ev_fixed_event_dispatch((u32) i);
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index f64f977dd3d5..7d7b81af972e 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -207,6 +207,7 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
                 ACPI_SET_BIT(gpe_event_info->flags, ACPI_GPE_RUN_ENABLED);
 
                 if (write_to_hardware) {
+
                         /* Clear the GPE (of stale events), then enable it */
 
                         status = acpi_hw_clear_gpe(gpe_event_info);
@@ -313,6 +314,7 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
         /* A NULL gpe_block means use the FADT-defined GPE block(s) */
 
         if (!gpe_device) {
+
                 /* Examine GPE Block 0 and 1 (These blocks are permanent) */
 
                 for (i = 0; i < ACPI_MAX_GPE_BLOCKS; i++) {
@@ -402,6 +404,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                  * Find all currently active GP events.
                  */
                 for (i = 0; i < gpe_block->register_count; i++) {
+
                         /* Get the next status/enable pair */
 
                         gpe_register_info = &gpe_block->register_info[i];
@@ -437,6 +440,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
 
                         enabled_status_byte = (u8) (status_reg & enable_reg);
                         if (!enabled_status_byte) {
+
                                 /* No active GPEs in this register, move on */
 
                                 continue;
@@ -445,6 +449,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
                         /* Now look at the individual GPEs in this byte register */
 
                         for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
+
                                 /* Examine one GPE bit */
 
                                 if (enabled_status_byte &
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index 0fd00b5ad650..87e77a138fff 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -146,10 +146,12 @@ acpi_status acpi_ev_walk_gpe_list(ACPI_GPE_CALLBACK gpe_walk_callback)
 
         gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;
         while (gpe_xrupt_info) {
+
                 /* Walk all Gpe Blocks attached to this interrupt level */
 
                 gpe_block = gpe_xrupt_info->gpe_block_list_head;
                 while (gpe_block) {
+
                         /* One callback per GPE block */
 
                         status = gpe_walk_callback(gpe_xrupt_info, gpe_block);
@@ -195,6 +197,7 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
         /* Examine each GPE Register within the block */
 
         for (i = 0; i < gpe_block->register_count; i++) {
+
                 /* Now look at the individual GPEs in this byte register */
 
                 for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
@@ -289,6 +292,7 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
 
         gpe_number = ACPI_STRTOUL(&name[2], NULL, 16);
         if (gpe_number == ACPI_UINT32_MAX) {
+
                 /* Conversion failed; invalid method, just ignore it */
 
                 ACPI_ERROR((AE_INFO,
@@ -371,6 +375,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
         status = acpi_ut_evaluate_object(obj_handle, METHOD_NAME__PRW,
                                          ACPI_BTYPE_PACKAGE, &pkg_desc);
         if (ACPI_FAILURE(status)) {
+
                 /* Ignore all errors from _PRW, we don't want to abort the subsystem */
 
                 return_ACPI_STATUS(AE_OK);
@@ -394,6 +399,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
         obj_desc = pkg_desc->package.elements[0];
 
         if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_INTEGER) {
+
                 /* Use FADT-defined GPE device (from definition of _PRW) */
 
                 target_gpe_device = acpi_gbl_fadt_gpe_device;
@@ -402,6 +408,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
 
                 gpe_number = (u32) obj_desc->integer.value;
         } else if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_PACKAGE) {
+
                 /* Package contains a GPE reference and GPE number within a GPE block */
 
                 if ((obj_desc->package.count < 2) ||
@@ -679,6 +686,7 @@ acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block)
         status = acpi_hw_disable_gpe_block(gpe_block->xrupt_block, gpe_block);
 
         if (!gpe_block->previous && !gpe_block->next) {
+
                 /* This is the last gpe_block on this interrupt */
 
                 status = acpi_ev_delete_gpe_xrupt(gpe_block->xrupt_block);
@@ -780,6 +788,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
         this_event = gpe_event_info;
 
         for (i = 0; i < gpe_block->register_count; i++) {
+
                 /* Init the register_info for this GPE register (8 GPEs) */
 
                 this_register->base_gpe_number =
@@ -1013,6 +1022,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
 
         for (i = 0; i < gpe_block->register_count; i++) {
                 for (j = 0; j < 8; j++) {
+
                         /* Get the info block for this particular GPE */
 
                         gpe_event_info =
@@ -1099,6 +1109,7 @@ acpi_status acpi_ev_gpe_initialize(void)
          * particular block is not supported.
          */
         if (acpi_gbl_FADT->gpe0_blk_len && acpi_gbl_FADT->xgpe0_blk.address) {
+
                 /* GPE block 0 exists (has both length and address > 0) */
 
                 register_count0 = (u16) (acpi_gbl_FADT->gpe0_blk_len / 2);
@@ -1121,6 +1132,7 @@ acpi_status acpi_ev_gpe_initialize(void)
         }
 
         if (acpi_gbl_FADT->gpe1_blk_len && acpi_gbl_FADT->xgpe1_blk.address) {
+
                 /* GPE block 1 exists (has both length and address > 0) */
 
                 register_count1 = (u16) (acpi_gbl_FADT->gpe1_blk_len / 2);
@@ -1168,6 +1180,7 @@ acpi_status acpi_ev_gpe_initialize(void)
         /* Exit if there are no GPE registers */
 
         if ((register_count0 + register_count1) == 0) {
+
                 /* GPEs are not required by ACPI, this is OK */
 
                 ACPI_DEBUG_PRINT((ACPI_DB_INIT,
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index 0909ba69577e..334407239f2f 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -150,6 +150,7 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
 
         obj_desc = acpi_ns_get_attached_object(node);
         if (obj_desc) {
+
                 /* We have the notify object, Get the right handler */
 
                 switch (node->type) {
@@ -240,6 +241,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context)
          * to the device.
          */
         if (notify_info->notify.value <= ACPI_MAX_SYS_NOTIFY) {
+
                 /* Global system notification handler */
 
                 if (acpi_gbl_system_notify.handler) {
@@ -297,6 +299,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_global_lock_thread(void *context)
         /* Signal threads that are waiting for the lock */
 
         if (acpi_gbl_global_lock_thread_count) {
+
                 /* Send sufficient units to the semaphore */
 
                 status =
@@ -335,6 +338,7 @@ static u32 acpi_ev_global_lock_handler(void *context)
          */
         ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_common_fACS.global_lock, acquired);
         if (acquired) {
+
                 /* Got the lock, now wake all threads waiting for it */
 
                 acpi_gbl_global_lock_acquired = TRUE;
@@ -439,6 +443,7 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
 
         ACPI_ACQUIRE_GLOBAL_LOCK(acpi_gbl_common_fACS.global_lock, acquired);
         if (acquired) {
+
                 /* We got the lock */
 
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
@@ -492,6 +497,7 @@ acpi_status acpi_ev_release_global_lock(void)
 
         acpi_gbl_global_lock_thread_count--;
         if (acpi_gbl_global_lock_thread_count) {
+
                 /* There are still some threads holding the lock, cannot release */
 
                 return_ACPI_STATUS(AE_OK);
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 6da58e776413..b831ec4bcae7 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -164,6 +164,7 @@ acpi_status acpi_ev_initialize_op_regions(void)
          * Run the _REG methods for op_regions in each default address space
          */
         for (i = 0; i < ACPI_NUM_DEFAULT_SPACES; i++) {
+
                 /* TBD: Make sure handler is the DEFAULT handler, otherwise
                  * _REG will have already been run.
                  */
@@ -315,6 +316,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                  */
                 region_setup = handler_desc->address_space.setup;
                 if (!region_setup) {
+
                         /* No initialization routine, exit with error */
 
                         ACPI_ERROR((AE_INFO,
@@ -361,6 +363,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
                         region_obj->region.flags |= AOPOBJ_SETUP_COMPLETE;
 
                         if (region_obj2->extra.region_context) {
+
                                 /* The handler for this region was already installed */
 
                                 ACPI_MEM_FREE(region_context);
@@ -463,6 +466,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
 
         handler_obj = region_obj->region.handler;
         if (!handler_obj) {
+
                 /* This region has no handler, all done */
 
                 return_VOID;
@@ -474,6 +478,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
         last_obj_ptr = &handler_obj->address_space.region_list;
 
         while (obj_desc) {
+
                 /* Is this the correct Region? */
 
                 if (obj_desc == region_obj) {
@@ -666,6 +671,7 @@ acpi_ev_install_handler(acpi_handle obj_handle,
 
         obj_desc = acpi_ns_get_attached_object(node);
         if (!obj_desc) {
+
                 /* No object, just exit */
 
                 return (AE_OK);
@@ -674,10 +680,12 @@ acpi_ev_install_handler(acpi_handle obj_handle,
         /* Devices are handled different than regions */
 
         if (ACPI_GET_OBJECT_TYPE(obj_desc) == ACPI_TYPE_DEVICE) {
+
                 /* Check if this Device already has a handler for this address space */
 
                 next_handler_obj = obj_desc->device.handler;
                 while (next_handler_obj) {
+
                         /* Found a handler, is it for the same address space? */
 
                         if (next_handler_obj->address_space.space_id ==
@@ -839,6 +847,7 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
                 /* Walk the handler list for this device */
 
                 while (handler_obj) {
+
                         /* Same space_id indicates a handler already installed */
 
                         if (handler_obj->address_space.space_id == space_id) {
@@ -1035,6 +1044,7 @@ acpi_ev_reg_run(acpi_handle obj_handle,
 
         obj_desc = acpi_ns_get_attached_object(node);
         if (!obj_desc) {
+
                 /* No object, just exit */
 
                 return (AE_OK);
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index baed8c1a1b9f..a0bffc2a0787 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -199,6 +199,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
          * handlers with that device.
          */
         if (handler_obj->address_space.node == acpi_gbl_root_node) {
+
                 /* Start search from the parent object */
 
                 pci_root_node = parent_node;
@@ -220,6 +221,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
                                         PCI_EXPRESS_ROOT_HID_STRING,
                                         sizeof(PCI_EXPRESS_ROOT_HID_STRING)))))
                                 {
+
                                         /* Install a handler for this PCI root bridge */
 
                                         status =
@@ -478,11 +480,13 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
          * ie: acpi_gbl_root_node->parent_entry being set to NULL
          */
         while (node) {
+
                 /* Check to see if a handler exists */
 
                 handler_obj = NULL;
                 obj_desc = acpi_ns_get_attached_object(node);
                 if (obj_desc) {
+
                         /* Can only be a handler if the object exists */
 
                         switch (node->type) {
@@ -507,10 +511,12 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
                         }
 
                         while (handler_obj) {
+
                                 /* Is this handler of the correct type? */
 
                                 if (handler_obj->address_space.space_id ==
                                     space_id) {
+
                                         /* Found correct handler */
 
                                         ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index b38b39dde543..ba16fda3a158 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -275,6 +275,7 @@ acpi_install_notify_handler(acpi_handle device,
          * only one <external> global handler can be regsitered (per notify type).
          */
         if (device == ACPI_ROOT_OBJECT) {
+
                 /* Make sure the handler is not already installed */
 
                 if (((handler_type & ACPI_SYSTEM_NOTIFY) &&
@@ -317,6 +318,7 @@ acpi_install_notify_handler(acpi_handle device,
 
                 obj_desc = acpi_ns_get_attached_object(node);
                 if (obj_desc) {
+
                         /* Object exists - make sure there's no handler */
 
                         if (((handler_type & ACPI_SYSTEM_NOTIFY) &&
@@ -370,6 +372,7 @@ acpi_install_notify_handler(acpi_handle device,
                 }
 
                 if (handler_type == ACPI_ALL_NOTIFY) {
+
                         /* Extra ref if installed in both */
 
                         acpi_ut_add_reference(notify_obj);
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index ec9ce8429f15..babebb501405 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.c
@@ -636,6 +636,7 @@ acpi_install_gpe_block(acpi_handle gpe_device,
 
         obj_desc = acpi_ns_get_attached_object(node);
         if (!obj_desc) {
+
                 /* No object, create a new one */
 
                 obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_DEVICE);
diff --git a/drivers/acpi/events/evxfregn.c b/drivers/acpi/events/evxfregn.c
index abf5caca9ae5..368c8aa0094b 100644
--- a/drivers/acpi/events/evxfregn.c
+++ b/drivers/acpi/events/evxfregn.c
@@ -176,9 +176,11 @@ acpi_remove_address_space_handler(acpi_handle device,
         handler_obj = obj_desc->device.handler;
         last_obj_ptr = &obj_desc->device.handler;
         while (handler_obj) {
+
                 /* We have a handler, see if user requested this one */
 
                 if (handler_obj->address_space.space_id == space_id) {
+
                         /* Matched space_id, first dereference this in the Regions */
 
                         ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,