vserver 1.9.3

[linux-2.6.git] / drivers / acpi / namespace / nsinit.c

diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index c8e9317..8617875 100644 (file)
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -149,7 +149,7 @@ acpi_ns_initialize_devices (
                return_ACPI_STATUS (status);
        }
 
-       /* Walk namespace for all objects of type Device or Processor */
+       /* Walk namespace for all objects */
 
        status = acpi_ns_walk_namespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
                          ACPI_UINT32_MAX, TRUE, acpi_ns_init_one_device, &info, NULL);
@@ -337,25 +337,29 @@ acpi_ns_init_one_device (
        void                            *context,
        void                            **return_value)
 {
-       acpi_status                     status;
-       struct acpi_namespace_node     *node;
-       u32                             flags;
        struct acpi_device_walk_info   *info = (struct acpi_device_walk_info *) context;
+       struct acpi_parameter_info      pinfo;
+       u32                             flags;
+       acpi_status                     status;
 
 
        ACPI_FUNCTION_TRACE ("ns_init_one_device");
 
 
-       node = acpi_ns_map_handle_to_node (obj_handle);
-       if (!node) {
+       pinfo.parameters = NULL;
+       pinfo.parameter_type = ACPI_PARAM_ARGS;
+
+       pinfo.node = acpi_ns_map_handle_to_node (obj_handle);
+       if (!pinfo.node) {
                return_ACPI_STATUS (AE_BAD_PARAMETER);
        }
 
        /*
-        * We will run _STA/_INI on Devices and Processors only
+        * We will run _STA/_INI on Devices, Processors and thermal_zones only
         */
-       if ((node->type != ACPI_TYPE_DEVICE) &&
-               (node->type != ACPI_TYPE_PROCESSOR)) {
+       if ((pinfo.node->type != ACPI_TYPE_DEVICE)      &&
+               (pinfo.node->type != ACPI_TYPE_PROCESSOR)   &&
+               (pinfo.node->type != ACPI_TYPE_THERMAL)) {
                return_ACPI_STATUS (AE_OK);
        }
 
@@ -368,17 +372,17 @@ acpi_ns_init_one_device (
        /*
         * Run _STA to determine if we can run _INI on the device.
         */
-       ACPI_DEBUG_EXEC (acpi_ut_display_init_pathname (ACPI_TYPE_METHOD, node, "_STA"));
-       status = acpi_ut_execute_STA (node, &flags);
+       ACPI_DEBUG_EXEC (acpi_ut_display_init_pathname (ACPI_TYPE_METHOD, pinfo.node, "_STA"));
+       status = acpi_ut_execute_STA (pinfo.node, &flags);
 
        if (ACPI_FAILURE (status)) {
-               if (node->type == ACPI_TYPE_DEVICE) {
+               if (pinfo.node->type == ACPI_TYPE_DEVICE) {
                        /* Ignore error and move on to next device */
 
                        return_ACPI_STATUS (AE_OK);
                }
 
-               /* _STA is not required for Processor objects */
+               /* _STA is not required for Processor or thermal_zone objects */
        }
        else {
                info->num_STA++;
@@ -393,22 +397,22 @@ acpi_ns_init_one_device (
        /*
         * The device is present. Run _INI.
         */
-       ACPI_DEBUG_EXEC (acpi_ut_display_init_pathname (ACPI_TYPE_METHOD, obj_handle, "_INI"));
-       status = acpi_ns_evaluate_relative (obj_handle, "_INI", NULL, NULL);
+       ACPI_DEBUG_EXEC (acpi_ut_display_init_pathname (ACPI_TYPE_METHOD, pinfo.node, "_INI"));
+       status = acpi_ns_evaluate_relative ("_INI", &pinfo);
        if (ACPI_FAILURE (status)) {
                /* No _INI (AE_NOT_FOUND) means device requires no initialization */
 
                if (status != AE_NOT_FOUND) {
                        /* Ignore error and move on to next device */
 
-       #ifdef ACPI_DEBUG_OUTPUT
-                       char                *scope_name = acpi_ns_get_external_pathname (obj_handle);
+#ifdef ACPI_DEBUG_OUTPUT
+                       char                *scope_name = acpi_ns_get_external_pathname (pinfo.node);
 
                        ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "%s._INI failed: %s\n",
                                        scope_name, acpi_format_exception (status)));
 
                        ACPI_MEM_FREE (scope_name);
-       #endif
+#endif
                }
 
                status = AE_OK;
@@ -422,7 +426,7 @@ acpi_ns_init_one_device (
        if (acpi_gbl_init_handler) {
                /* External initialization handler is present, call it */
 
-               status = acpi_gbl_init_handler (obj_handle, ACPI_INIT_DEVICE_INI);
+               status = acpi_gbl_init_handler (pinfo.node, ACPI_INIT_DEVICE_INI);
        }