[CPUFREQ] Fix up merge conflicts with recent ACPI changes.

[linux-2.6-omap-h63xx.git] / drivers / acpi / utilities / utxface.c

diff --git a/drivers/acpi/utilities/utxface.c b/drivers/acpi/utilities/utxface.c
index ac90048a8a5b3ff65d7f298e9d0b5678c23e2053..de3276f4f4683ec4aee9fb4a794ec9ace654636f 100644 (file)
--- a/drivers/acpi/utilities/utxface.c
+++ b/drivers/acpi/utilities/utxface.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,8 +65,9 @@ acpi_status acpi_initialize_subsystem(void)
 {
        acpi_status status;
 
-       ACPI_FUNCTION_TRACE("acpi_initialize_subsystem");
+       ACPI_FUNCTION_TRACE(acpi_initialize_subsystem);
 
+       acpi_gbl_startup_flags = ACPI_SUBSYSTEM_INITIALIZE;
        ACPI_DEBUG_EXEC(acpi_ut_init_stack_ptr_trace());
 
        /* Initialize the OS-Dependent layer */
@@ -125,21 +126,7 @@ acpi_status acpi_enable_subsystem(u32 flags)
 {
        acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE("acpi_enable_subsystem");
-
-       /*
-        * We must initialize the hardware before we can enable ACPI.
-        * The values from the FADT are validated here.
-        */
-       if (!(flags & ACPI_NO_HARDWARE_INIT)) {
-               ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                                 "[Init] Initializing ACPI hardware\n"));
-
-               status = acpi_hw_initialize();
-               if (ACPI_FAILURE(status)) {
-                       return_ACPI_STATUS(status);
-               }
-       }
+       ACPI_FUNCTION_TRACE(acpi_enable_subsystem);
 
        /* Enable ACPI mode */
 
@@ -151,7 +138,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 +233,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 +244,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 +309,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 */
 
@@ -398,9 +385,8 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)
 {
        struct acpi_system_info *info_ptr;
        acpi_status status;
-       u32 i;
 
-       ACPI_FUNCTION_TRACE("acpi_get_system_info");
+       ACPI_FUNCTION_TRACE(acpi_get_system_info);
 
        /* Parameter validation */
 
@@ -431,9 +417,7 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)
 
        /* Timer resolution - 24 or 32 bits  */
 
-       if (!acpi_gbl_FADT) {
-               info_ptr->timer_resolution = 0;
-       } else if (acpi_gbl_FADT->tmr_val_ext == 0) {
+       if (acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER) {
                info_ptr->timer_resolution = 24;
        } else {
                info_ptr->timer_resolution = 32;
@@ -449,13 +433,6 @@ acpi_status acpi_get_system_info(struct acpi_buffer * out_buffer)
        info_ptr->debug_layer = acpi_dbg_layer;
        info_ptr->debug_level = acpi_dbg_level;
 
-       /* 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->table_info[i].count = acpi_gbl_table_lists[i].count;
-       }
-
        return_ACPI_STATUS(AE_OK);
 }
 
@@ -507,7 +484,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);