1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c
index ac90048a8a5b..3538f69c82a1 100644
--- a/drivers/acpi/utilities/utxface.c
+++ b/drivers/acpi/utilities/utxface.c
@@ -65,7 +65,7 @@ acpi_status acpi_initialize_subsystem(void)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_initialize_subsystem");
+        ACPI_FUNCTION_TRACE(acpi_initialize_subsystem);
 
         ACPI_DEBUG_EXEC(acpi_ut_init_stack_ptr_trace());
 
@@ -125,7 +125,7 @@ acpi_status acpi_enable_subsystem(u32 flags)
 {
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("acpi_enable_subsystem");
+        ACPI_FUNCTION_TRACE(acpi_enable_subsystem);
 
         /*
          * We must initialize the hardware before we can enable ACPI.
@@ -151,7 +151,7 @@ acpi_status acpi_enable_subsystem(u32 flags)
 
                 status = acpi_enable();
                 if (ACPI_FAILURE(status)) {
-                        ACPI_WARNING((AE_INFO, "acpi_enable failed"));
+                        ACPI_WARNING((AE_INFO, "AcpiEnable failed"));
                         return_ACPI_STATUS(status);
                 }
         }
@@ -246,7 +246,7 @@ acpi_status acpi_initialize_objects(u32 flags)
 {
         acpi_status status = AE_OK;
 
-        ACPI_FUNCTION_TRACE("acpi_initialize_objects");
+        ACPI_FUNCTION_TRACE(acpi_initialize_objects);
 
         /*
          * Run all _REG methods
@@ -257,7 +257,7 @@ acpi_status acpi_initialize_objects(u32 flags)
          */
         if (!(flags & ACPI_NO_ADDRESS_SPACE_INIT)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                  "[Init] Executing _REG op_region methods\n"));
+                                  "[Init] Executing _REG OpRegion methods\n"));
 
                 status = acpi_ev_initialize_op_regions();
                 if (ACPI_FAILURE(status)) {
@@ -322,7 +322,7 @@ acpi_status acpi_terminate(void)
 {
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("acpi_terminate");
+        ACPI_FUNCTION_TRACE(acpi_terminate);
 
         /* Terminate the AML Debugger if present */
 
@@ -400,7 +400,7 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)
         acpi_status status;
         u32 i;
 
-        ACPI_FUNCTION_TRACE("acpi_get_system_info");
+        ACPI_FUNCTION_TRACE(acpi_get_system_info);
 
         /* Parameter validation */
 
@@ -451,8 +451,8 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)
 
         /* Current status of the ACPI tables, per table type */
 
-        info_ptr->num_table_types = NUM_ACPI_TABLE_TYPES;
-        for (i = 0; i < NUM_ACPI_TABLE_TYPES; i++) {
+        info_ptr->num_table_types = ACPI_TABLE_ID_MAX + 1;
+        for (i = 0; i < (ACPI_TABLE_ID_MAX + 1); i++) {
                 info_ptr->table_info[i].count = acpi_gbl_table_lists[i].count;
         }
 
@@ -507,7 +507,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_initialization_handler)
  ****************************************************************************/
 acpi_status acpi_purge_cached_objects(void)
 {
-        ACPI_FUNCTION_TRACE("acpi_purge_cached_objects");
+        ACPI_FUNCTION_TRACE(acpi_purge_cached_objects);
 
         (void)acpi_os_purge_cache(acpi_gbl_state_cache);
         (void)acpi_os_purge_cache(acpi_gbl_operand_cache);