10 files changed, 85 insertions, 85 deletions

diff --git a/drivers/acpi/events/evevent.c b/drivers/acpi/events/evevent.c
index c8d9752e3128..919037d6acff 100644
--- a/drivers/acpi/events/evevent.c
+++ b/drivers/acpi/events/evevent.c
@@ -68,7 +68,7 @@ acpi_status acpi_ev_initialize_events(void)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_initialize_events");
+        ACPI_FUNCTION_TRACE(ev_initialize_events);
 
         /* Make sure we have ACPI tables */
 
@@ -118,7 +118,7 @@ acpi_status acpi_ev_install_fadt_gpes(void)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_install_fadt_gpes");
+        ACPI_FUNCTION_TRACE(ev_install_fadt_gpes);
 
         /* Namespace must be locked */
 
@@ -157,7 +157,7 @@ acpi_status acpi_ev_install_xrupt_handlers(void)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_install_xrupt_handlers");
+        ACPI_FUNCTION_TRACE(ev_install_xrupt_handlers);
 
         /* Install the SCI handler */
 
@@ -241,7 +241,7 @@ u32 acpi_ev_fixed_event_detect(void)
         u32 fixed_enable;
         acpi_native_uint i;
 
-        ACPI_FUNCTION_NAME("ev_fixed_event_detect");
+        ACPI_FUNCTION_NAME(ev_fixed_event_detect);
 
         /*
          * Read the fixed feature status and enable registers, as all the cases
diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index 7d7b81af972e..25fd12a29a29 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -69,7 +69,7 @@ acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_set_gpe_type");
+        ACPI_FUNCTION_TRACE(ev_set_gpe_type);
 
         /* Validate type and update register enable masks */
 
@@ -115,7 +115,7 @@ acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info,
         struct acpi_gpe_register_info *gpe_register_info;
         u8 register_bit;
 
-        ACPI_FUNCTION_TRACE("ev_update_gpe_enable_masks");
+        ACPI_FUNCTION_TRACE(ev_update_gpe_enable_masks);
 
         gpe_register_info = gpe_event_info->register_info;
         if (!gpe_register_info) {
@@ -178,7 +178,7 @@ acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info,
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_enable_gpe");
+        ACPI_FUNCTION_TRACE(ev_enable_gpe);
 
         /* Make sure HW enable masks are updated */
 
@@ -244,7 +244,7 @@ acpi_status acpi_ev_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_disable_gpe");
+        ACPI_FUNCTION_TRACE(ev_disable_gpe);
 
         if (!(gpe_event_info->flags & ACPI_GPE_ENABLE_MASK)) {
                 return_ACPI_STATUS(AE_OK);
@@ -385,7 +385,7 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
         acpi_native_uint i;
         acpi_native_uint j;
 
-        ACPI_FUNCTION_NAME("ev_gpe_detect");
+        ACPI_FUNCTION_NAME(ev_gpe_detect);
 
         /* Check for the case where there are no GPEs */
 
@@ -504,7 +504,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
         struct acpi_gpe_event_info local_gpe_event_info;
         struct acpi_parameter_info info;
 
-        ACPI_FUNCTION_TRACE("ev_asynch_execute_gpe_method");
+        ACPI_FUNCTION_TRACE(ev_asynch_execute_gpe_method);
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
         if (ACPI_FAILURE(status)) {
@@ -598,7 +598,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_gpe_dispatch");
+        ACPI_FUNCTION_TRACE(ev_gpe_dispatch);
 
         /*
          * If edge-triggered, clear the GPE status bit now.  Note that
@@ -721,7 +721,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
  *
  * DESCRIPTION: Determine if a a GPE is "wake-only".
  *
- *              Called from Notify() code in interpreter when a "device_wake"
+ *              Called from Notify() code in interpreter when a "DeviceWake"
  *              Notify comes in.
  *
  ******************************************************************************/
@@ -731,7 +731,7 @@ acpi_ev_check_for_wake_only_gpe(struct acpi_gpe_event_info *gpe_event_info)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_check_for_wake_only_gpe");
+        ACPI_FUNCTION_TRACE(ev_check_for_wake_only_gpe);
 
         if ((gpe_event_info) && /* Only >0 for _Lxx/_Exx */
             ((gpe_event_info->flags & ACPI_GPE_SYSTEM_MASK) == ACPI_GPE_SYSTEM_RUNNING)) {      /* System state at GPE time */
diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
index 4e90c1f837c3..95ddeb48bc0f 100644
--- a/drivers/acpi/events/evgpeblk.c
+++ b/drivers/acpi/events/evgpeblk.c
@@ -138,7 +138,7 @@ acpi_status acpi_ev_walk_gpe_list(acpi_gpe_callback gpe_walk_callback)
         acpi_status status = AE_OK;
         acpi_cpu_flags flags;
 
-        ACPI_FUNCTION_TRACE("ev_walk_gpe_list");
+        ACPI_FUNCTION_TRACE(ev_walk_gpe_list);
 
         flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
 
@@ -192,7 +192,7 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
         acpi_native_uint i;
         acpi_native_uint j;
 
-        ACPI_FUNCTION_TRACE("ev_delete_gpe_handlers");
+        ACPI_FUNCTION_TRACE(ev_delete_gpe_handlers);
 
         /* Examine each GPE Register within the block */
 
@@ -251,7 +251,7 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
         u8 type;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_save_method_info");
+        ACPI_FUNCTION_TRACE(ev_save_method_info);
 
         /*
          * _Lxx and _Exx GPE method support
@@ -282,9 +282,9 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
         default:
                 /* Unknown method type, just ignore it! */
 
-                ACPI_ERROR((AE_INFO,
-                            "Unknown GPE method type: %s (name not of form _Lxx or _Exx)",
-                            name));
+                ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
+                                  "Ignoring unknown GPE method type: %s (name not of form _Lxx or _Exx)",
+                                  name));
                 return_ACPI_STATUS(AE_OK);
         }
 
@@ -295,9 +295,9 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
 
                 /* Conversion failed; invalid method, just ignore it */
 
-                ACPI_ERROR((AE_INFO,
-                            "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)",
-                            name));
+                ACPI_DEBUG_PRINT((ACPI_DB_LOAD,
+                                  "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)",
+                                  name));
                 return_ACPI_STATUS(AE_OK);
         }
 
@@ -368,7 +368,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
         u32 gpe_number;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_match_prw_and_gpe");
+        ACPI_FUNCTION_TRACE(ev_match_prw_and_gpe);
 
         /* Check for a _PRW method under this device */
 
@@ -489,7 +489,7 @@ static struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32
         acpi_status status;
         acpi_cpu_flags flags;
 
-        ACPI_FUNCTION_TRACE("ev_get_gpe_xrupt_block");
+        ACPI_FUNCTION_TRACE(ev_get_gpe_xrupt_block);
 
         /* No need for lock since we are not changing any list elements here */
 
@@ -563,7 +563,7 @@ acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
         acpi_status status;
         acpi_cpu_flags flags;
 
-        ACPI_FUNCTION_TRACE("ev_delete_gpe_xrupt");
+        ACPI_FUNCTION_TRACE(ev_delete_gpe_xrupt);
 
         /* We never want to remove the SCI interrupt handler */
 
@@ -621,7 +621,7 @@ acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
         acpi_status status;
         acpi_cpu_flags flags;
 
-        ACPI_FUNCTION_TRACE("ev_install_gpe_block");
+        ACPI_FUNCTION_TRACE(ev_install_gpe_block);
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
         if (ACPI_FAILURE(status)) {
@@ -674,7 +674,7 @@ acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block)
         acpi_status status;
         acpi_cpu_flags flags;
 
-        ACPI_FUNCTION_TRACE("ev_install_gpe_block");
+        ACPI_FUNCTION_TRACE(ev_install_gpe_block);
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
         if (ACPI_FAILURE(status)) {
@@ -744,7 +744,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
         acpi_native_uint j;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_create_gpe_info_blocks");
+        ACPI_FUNCTION_TRACE(ev_create_gpe_info_blocks);
 
         /* Allocate the GPE register information block */
 
@@ -754,7 +754,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
                                                         acpi_gpe_register_info));
         if (!gpe_register_info) {
                 ACPI_ERROR((AE_INFO,
-                            "Could not allocate the gpe_register_info table"));
+                            "Could not allocate the GpeRegisterInfo table"));
                 return_ACPI_STATUS(AE_NO_MEMORY);
         }
 
@@ -769,7 +769,7 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)
                                                      acpi_gpe_event_info));
         if (!gpe_event_info) {
                 ACPI_ERROR((AE_INFO,
-                            "Could not allocate the gpe_event_info table"));
+                            "Could not allocate the GpeEventInfo table"));
                 status = AE_NO_MEMORY;
                 goto error_exit;
         }
@@ -888,7 +888,7 @@ acpi_ev_create_gpe_block(struct acpi_namespace_node *gpe_device,
         acpi_status status;
         struct acpi_gpe_block_info *gpe_block;
 
-        ACPI_FUNCTION_TRACE("ev_create_gpe_block");
+        ACPI_FUNCTION_TRACE(ev_create_gpe_block);
 
         if (!register_count) {
                 return_ACPI_STATUS(AE_OK);
@@ -981,7 +981,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
         acpi_native_uint i;
         acpi_native_uint j;
 
-        ACPI_FUNCTION_TRACE("ev_initialize_gpe_block");
+        ACPI_FUNCTION_TRACE(ev_initialize_gpe_block);
 
         /* Ignore a null GPE block (e.g., if no GPE block 1 exists) */
 
@@ -1051,7 +1051,7 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device,
 
         status = acpi_hw_enable_runtime_gpe_block(NULL, gpe_block);
         if (ACPI_FAILURE(status)) {
-                ACPI_ERROR((AE_INFO, "Could not enable GPEs in gpe_block %p",
+                ACPI_ERROR((AE_INFO, "Could not enable GPEs in GpeBlock %p",
                             gpe_block));
         }
 
@@ -1077,7 +1077,7 @@ acpi_status acpi_ev_gpe_initialize(void)
         u32 gpe_number_max = 0;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_gpe_initialize");
+        ACPI_FUNCTION_TRACE(ev_gpe_initialize);
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
         if (ACPI_FAILURE(status)) {
diff --git a/drivers/acpi/events/evmisc.c b/drivers/acpi/events/evmisc.c
index b216b3229e27..97e05481aa7c 100644
--- a/drivers/acpi/events/evmisc.c
+++ b/drivers/acpi/events/evmisc.c
@@ -124,7 +124,7 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
         union acpi_generic_state *notify_info;
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_NAME("ev_queue_notify_request");
+        ACPI_FUNCTION_NAME(ev_queue_notify_request);
 
         /*
          * For value 3 (Ejection Request), some device method may need to be run.
@@ -376,7 +376,7 @@ acpi_status acpi_ev_init_global_lock_handler(void)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_init_global_lock_handler");
+        ACPI_FUNCTION_TRACE(ev_init_global_lock_handler);
 
         acpi_gbl_global_lock_present = TRUE;
         status = acpi_install_fixed_event_handler(ACPI_EVENT_GLOBAL,
@@ -418,7 +418,7 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
         acpi_status status = AE_OK;
         u8 acquired = FALSE;
 
-        ACPI_FUNCTION_TRACE("ev_acquire_global_lock");
+        ACPI_FUNCTION_TRACE(ev_acquire_global_lock);
 
 #ifndef ACPI_APPLICATION
         /* Make sure that we actually have a global lock */
@@ -486,7 +486,7 @@ acpi_status acpi_ev_release_global_lock(void)
         u8 pending = FALSE;
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("ev_release_global_lock");
+        ACPI_FUNCTION_TRACE(ev_release_global_lock);
 
         if (!acpi_gbl_global_lock_thread_count) {
                 ACPI_WARNING((AE_INFO,
@@ -540,7 +540,7 @@ void acpi_ev_terminate(void)
         acpi_native_uint i;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_terminate");
+        ACPI_FUNCTION_TRACE(ev_terminate);
 
         if (acpi_gbl_events_initialized) {
                 /*
@@ -580,7 +580,7 @@ void acpi_ev_terminate(void)
         if (acpi_gbl_original_mode == ACPI_SYS_MODE_LEGACY) {
                 status = acpi_disable();
                 if (ACPI_FAILURE(status)) {
-                        ACPI_WARNING((AE_INFO, "acpi_disable failed"));
+                        ACPI_WARNING((AE_INFO, "AcpiDisable failed"));
                 }
         }
         return_VOID;
diff --git a/drivers/acpi/events/evregion.c b/drivers/acpi/events/evregion.c
index 0337ad222b26..eb29e96f053c 100644
--- a/drivers/acpi/events/evregion.c
+++ b/drivers/acpi/events/evregion.c
@@ -83,7 +83,7 @@ acpi_status acpi_ev_install_region_handlers(void)
         acpi_status status;
         acpi_native_uint i;
 
-        ACPI_FUNCTION_TRACE("ev_install_region_handlers");
+        ACPI_FUNCTION_TRACE(ev_install_region_handlers);
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
         if (ACPI_FAILURE(status)) {
@@ -153,7 +153,7 @@ acpi_status acpi_ev_initialize_op_regions(void)
         acpi_status status;
         acpi_native_uint i;
 
-        ACPI_FUNCTION_TRACE("ev_initialize_op_regions");
+        ACPI_FUNCTION_TRACE(ev_initialize_op_regions);
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
         if (ACPI_FAILURE(status)) {
@@ -198,7 +198,7 @@ acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
         union acpi_operand_object *region_obj2;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_execute_reg_method");
+        ACPI_FUNCTION_TRACE(ev_execute_reg_method);
 
         region_obj2 = acpi_ns_get_secondary_object(region_obj);
         if (!region_obj2) {
@@ -284,7 +284,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
         union acpi_operand_object *region_obj2;
         void *region_context = NULL;
 
-        ACPI_FUNCTION_TRACE("ev_address_space_dispatch");
+        ACPI_FUNCTION_TRACE(ev_address_space_dispatch);
 
         region_obj2 = acpi_ns_get_secondary_object(region_obj);
         if (!region_obj2) {
@@ -451,7 +451,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
         union acpi_operand_object *region_obj2;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_detach_region");
+        ACPI_FUNCTION_TRACE(ev_detach_region);
 
         region_obj2 = acpi_ns_get_secondary_object(region_obj);
         if (!region_obj2) {
@@ -585,7 +585,7 @@ acpi_ev_attach_region(union acpi_operand_object *handler_obj,
                       u8 acpi_ns_is_locked)
 {
 
-        ACPI_FUNCTION_TRACE("ev_attach_region");
+        ACPI_FUNCTION_TRACE(ev_attach_region);
 
         ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
                           "Adding Region [%4.4s] %p to address handler %p [%s]\n",
@@ -638,7 +638,7 @@ acpi_ev_install_handler(acpi_handle obj_handle,
         struct acpi_namespace_node *node;
         acpi_status status;
 
-        ACPI_FUNCTION_NAME("ev_install_handler");
+        ACPI_FUNCTION_NAME(ev_install_handler);
 
         handler_obj = (union acpi_operand_object *)context;
 
@@ -771,7 +771,7 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
         acpi_object_type type;
         u8 flags = 0;
 
-        ACPI_FUNCTION_TRACE("ev_install_space_handler");
+        ACPI_FUNCTION_TRACE(ev_install_space_handler);
 
         /*
          * This registration is valid for only the types below
@@ -985,7 +985,7 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_execute_reg_methods");
+        ACPI_FUNCTION_TRACE(ev_execute_reg_methods);
 
         /*
          * Run all _REG methods for all Operation Regions for this
diff --git a/drivers/acpi/events/evrgnini.c b/drivers/acpi/events/evrgnini.c
index d1809f4240a4..1cecd577b899 100644
--- a/drivers/acpi/events/evrgnini.c
+++ b/drivers/acpi/events/evrgnini.c
@@ -71,7 +71,7 @@ acpi_ev_system_memory_region_setup(acpi_handle handle,
             (union acpi_operand_object *)handle;
         struct acpi_mem_space_context *local_region_context;
 
-        ACPI_FUNCTION_TRACE("ev_system_memory_region_setup");
+        ACPI_FUNCTION_TRACE(ev_system_memory_region_setup);
 
         if (function == ACPI_REGION_DEACTIVATE) {
                 if (*region_context) {
@@ -129,7 +129,7 @@ acpi_ev_io_space_region_setup(acpi_handle handle,
                               u32 function,
                               void *handler_context, void **region_context)
 {
-        ACPI_FUNCTION_TRACE("ev_io_space_region_setup");
+        ACPI_FUNCTION_TRACE(ev_io_space_region_setup);
 
         if (function == ACPI_REGION_DEACTIVATE) {
                 *region_context = NULL;
@@ -172,7 +172,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
             (union acpi_operand_object *)handle;
         struct acpi_device_id object_hID;
 
-        ACPI_FUNCTION_TRACE("ev_pci_config_region_setup");
+        ACPI_FUNCTION_TRACE(ev_pci_config_region_setup);
 
         handler_obj = region_obj->region.handler;
         if (!handler_obj) {
@@ -248,7 +248,7 @@ acpi_ev_pci_config_region_setup(acpi_handle handle,
                                                 } else {
                                                         ACPI_EXCEPTION((AE_INFO,
                                                                         status,
-                                                                        "Could not install pci_config handler for Root Bridge %4.4s",
+                                                                        "Could not install PciConfig handler for Root Bridge %4.4s",
                                                                         acpi_ut_get_node_name
                                                                         (pci_root_node)));
                                                 }
@@ -350,7 +350,7 @@ acpi_ev_pci_bar_region_setup(acpi_handle handle,
                              u32 function,
                              void *handler_context, void **region_context)
 {
-        ACPI_FUNCTION_TRACE("ev_pci_bar_region_setup");
+        ACPI_FUNCTION_TRACE(ev_pci_bar_region_setup);
 
         return_ACPI_STATUS(AE_OK);
 }
@@ -377,7 +377,7 @@ acpi_ev_cmos_region_setup(acpi_handle handle,
                           u32 function,
                           void *handler_context, void **region_context)
 {
-        ACPI_FUNCTION_TRACE("ev_cmos_region_setup");
+        ACPI_FUNCTION_TRACE(ev_cmos_region_setup);
 
         return_ACPI_STATUS(AE_OK);
 }
@@ -402,7 +402,7 @@ acpi_ev_default_region_setup(acpi_handle handle,
                              u32 function,
                              void *handler_context, void **region_context)
 {
-        ACPI_FUNCTION_TRACE("ev_default_region_setup");
+        ACPI_FUNCTION_TRACE(ev_default_region_setup);
 
         if (function == ACPI_REGION_DEACTIVATE) {
                 *region_context = NULL;
@@ -448,7 +448,7 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
         acpi_name *reg_name_ptr = (acpi_name *) METHOD_NAME__REG;
         union acpi_operand_object *region_obj2;
 
-        ACPI_FUNCTION_TRACE_U32("ev_initialize_region", acpi_ns_locked);
+        ACPI_FUNCTION_TRACE_U32(ev_initialize_region, acpi_ns_locked);
 
         if (!region_obj) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -588,7 +588,7 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
         /* If we get here, there is no handler for this region */
 
         ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
-                          "No handler for region_type %s(%X) (region_obj %p)\n",
+                          "No handler for RegionType %s(%X) (RegionObj %p)\n",
                           acpi_ut_get_region_name(space_id), space_id,
                           region_obj));
 
diff --git a/drivers/acpi/events/evsci.c b/drivers/acpi/events/evsci.c
index 9a622169008a..8106215ad554 100644
--- a/drivers/acpi/events/evsci.c
+++ b/drivers/acpi/events/evsci.c
@@ -69,7 +69,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context)
         struct acpi_gpe_xrupt_info *gpe_xrupt_list = context;
         u32 interrupt_handled = ACPI_INTERRUPT_NOT_HANDLED;
 
-        ACPI_FUNCTION_TRACE("ev_sci_xrupt_handler");
+        ACPI_FUNCTION_TRACE(ev_sci_xrupt_handler);
 
         /*
          * We are guaranteed by the ACPI CA initialization/shutdown code that
@@ -108,7 +108,7 @@ u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context)
         struct acpi_gpe_xrupt_info *gpe_xrupt_list = context;
         u32 interrupt_handled = ACPI_INTERRUPT_NOT_HANDLED;
 
-        ACPI_FUNCTION_TRACE("ev_gpe_xrupt_handler");
+        ACPI_FUNCTION_TRACE(ev_gpe_xrupt_handler);
 
         /*
          * We are guaranteed by the ACPI CA initialization/shutdown code that
@@ -140,7 +140,7 @@ u32 acpi_ev_install_sci_handler(void)
 {
         u32 status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("ev_install_sci_handler");
+        ACPI_FUNCTION_TRACE(ev_install_sci_handler);
 
         status = acpi_os_install_interrupt_handler((u32) acpi_gbl_FADT->sci_int,
                                                    acpi_ev_sci_xrupt_handler,
@@ -171,7 +171,7 @@ acpi_status acpi_ev_remove_sci_handler(void)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ev_remove_sci_handler");
+        ACPI_FUNCTION_TRACE(ev_remove_sci_handler);
 
         /* Just let the OS remove the handler and disable the level */
 
diff --git a/drivers/acpi/events/evxface.c b/drivers/acpi/events/evxface.c
index 7d1cebc871f6..76c34a66e0e0 100644
--- a/drivers/acpi/events/evxface.c
+++ b/drivers/acpi/events/evxface.c
@@ -66,7 +66,7 @@ acpi_status acpi_install_exception_handler(acpi_exception_handler handler)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_install_exception_handler");
+        ACPI_FUNCTION_TRACE(acpi_install_exception_handler);
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
         if (ACPI_FAILURE(status)) {
@@ -113,7 +113,7 @@ acpi_install_fixed_event_handler(u32 event,
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_install_fixed_event_handler");
+        ACPI_FUNCTION_TRACE(acpi_install_fixed_event_handler);
 
         /* Parameter validation */
 
@@ -179,7 +179,7 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler)
 {
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("acpi_remove_fixed_event_handler");
+        ACPI_FUNCTION_TRACE(acpi_remove_fixed_event_handler);
 
         /* Parameter validation */
 
@@ -243,7 +243,7 @@ acpi_install_notify_handler(acpi_handle device,
         struct acpi_namespace_node *node;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_install_notify_handler");
+        ACPI_FUNCTION_TRACE(acpi_install_notify_handler);
 
         /* Parameter validation */
 
@@ -408,7 +408,7 @@ acpi_remove_notify_handler(acpi_handle device,
         struct acpi_namespace_node *node;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_remove_notify_handler");
+        ACPI_FUNCTION_TRACE(acpi_remove_notify_handler);
 
         /* Parameter validation */
 
@@ -563,7 +563,7 @@ acpi_install_gpe_handler(acpi_handle gpe_device,
         acpi_status status;
         acpi_cpu_flags flags;
 
-        ACPI_FUNCTION_TRACE("acpi_install_gpe_handler");
+        ACPI_FUNCTION_TRACE(acpi_install_gpe_handler);
 
         /* Parameter validation */
 
@@ -653,7 +653,7 @@ acpi_remove_gpe_handler(acpi_handle gpe_device,
         acpi_status status;
         acpi_cpu_flags flags;
 
-        ACPI_FUNCTION_TRACE("acpi_remove_gpe_handler");
+        ACPI_FUNCTION_TRACE(acpi_remove_gpe_handler);
 
         /* Parameter validation */
 
diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index 4a36559fa816..7ebc2efac936 100644
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.c
@@ -63,7 +63,7 @@ acpi_status acpi_enable(void)
 {
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("acpi_enable");
+        ACPI_FUNCTION_TRACE(acpi_enable);
 
         /* Make sure we have the FADT */
 
@@ -109,7 +109,7 @@ acpi_status acpi_disable(void)
 {
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("acpi_disable");
+        ACPI_FUNCTION_TRACE(acpi_disable);
 
         if (!acpi_gbl_FADT) {
                 ACPI_WARNING((AE_INFO, "No FADT information present!"));
@@ -155,7 +155,7 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
         acpi_status status = AE_OK;
         u32 value;
 
-        ACPI_FUNCTION_TRACE("acpi_enable_event");
+        ACPI_FUNCTION_TRACE(acpi_enable_event);
 
         /* Decode the Fixed Event */
 
@@ -213,7 +213,7 @@ acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type)
         acpi_status status = AE_OK;
         struct acpi_gpe_event_info *gpe_event_info;
 
-        ACPI_FUNCTION_TRACE("acpi_set_gpe_type");
+        ACPI_FUNCTION_TRACE(acpi_set_gpe_type);
 
         /* Ensure that we have a valid GPE number */
 
@@ -256,7 +256,7 @@ acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
         acpi_status status = AE_OK;
         struct acpi_gpe_event_info *gpe_event_info;
 
-        ACPI_FUNCTION_TRACE("acpi_enable_gpe");
+        ACPI_FUNCTION_TRACE(acpi_enable_gpe);
 
         /* Use semaphore lock if not executing at interrupt level */
 
@@ -307,7 +307,7 @@ acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
         acpi_status status = AE_OK;
         struct acpi_gpe_event_info *gpe_event_info;
 
-        ACPI_FUNCTION_TRACE("acpi_disable_gpe");
+        ACPI_FUNCTION_TRACE(acpi_disable_gpe);
 
         /* Use semaphore lock if not executing at interrupt level */
 
@@ -354,7 +354,7 @@ acpi_status acpi_disable_event(u32 event, u32 flags)
         acpi_status status = AE_OK;
         u32 value;
 
-        ACPI_FUNCTION_TRACE("acpi_disable_event");
+        ACPI_FUNCTION_TRACE(acpi_disable_event);
 
         /* Decode the Fixed Event */
 
@@ -407,7 +407,7 @@ acpi_status acpi_clear_event(u32 event)
 {
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("acpi_clear_event");
+        ACPI_FUNCTION_TRACE(acpi_clear_event);
 
         /* Decode the Fixed Event */
 
@@ -446,7 +446,7 @@ acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
         acpi_status status = AE_OK;
         struct acpi_gpe_event_info *gpe_event_info;
 
-        ACPI_FUNCTION_TRACE("acpi_clear_gpe");
+        ACPI_FUNCTION_TRACE(acpi_clear_gpe);
 
         /* Use semaphore lock if not executing at interrupt level */
 
@@ -494,7 +494,7 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
 {
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("acpi_get_event_status");
+        ACPI_FUNCTION_TRACE(acpi_get_event_status);
 
         if (!event_status) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -539,7 +539,7 @@ acpi_get_gpe_status(acpi_handle gpe_device,
         acpi_status status = AE_OK;
         struct acpi_gpe_event_info *gpe_event_info;
 
-        ACPI_FUNCTION_TRACE("acpi_get_gpe_status");
+        ACPI_FUNCTION_TRACE(acpi_get_gpe_status);
 
         /* Use semaphore lock if not executing at interrupt level */
 
@@ -596,7 +596,7 @@ acpi_install_gpe_block(acpi_handle gpe_device,
         struct acpi_namespace_node *node;
         struct acpi_gpe_block_info *gpe_block;
 
-        ACPI_FUNCTION_TRACE("acpi_install_gpe_block");
+        ACPI_FUNCTION_TRACE(acpi_install_gpe_block);
 
         if ((!gpe_device) || (!gpe_block_address) || (!register_count)) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -684,7 +684,7 @@ acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
         acpi_status status;
         struct acpi_namespace_node *node;
 
-        ACPI_FUNCTION_TRACE("acpi_remove_gpe_block");
+        ACPI_FUNCTION_TRACE(acpi_remove_gpe_block);
 
         if (!gpe_device) {
                 return_ACPI_STATUS(AE_BAD_PARAMETER);
diff --git a/drivers/acpi/events/evxfregn.c b/drivers/acpi/events/evxfregn.c
index 63a070bb9d17..e8b86a0baad0 100644
--- a/drivers/acpi/events/evxfregn.c
+++ b/drivers/acpi/events/evxfregn.c
@@ -73,7 +73,7 @@ acpi_install_address_space_handler(acpi_handle device,
         struct acpi_namespace_node *node;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_install_address_space_handler");
+        ACPI_FUNCTION_TRACE(acpi_install_address_space_handler);
 
         /* Parameter validation */
 
@@ -139,7 +139,7 @@ acpi_remove_address_space_handler(acpi_handle device,
         struct acpi_namespace_node *node;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_remove_address_space_handler");
+        ACPI_FUNCTION_TRACE(acpi_remove_address_space_handler);
 
         /* Parameter validation */
 
@@ -228,7 +228,7 @@ acpi_remove_address_space_handler(acpi_handle device,
         /* The handler does not exist */
 
         ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
-                          "Unable to remove address handler %p for %s(%X), dev_node %p, obj %p\n",
+                          "Unable to remove address handler %p for %s(%X), DevNode %p, obj %p\n",
                           handler, acpi_ut_get_region_name(space_id), space_id,
                           node, obj_desc));