Merge branch 'acpi-misc'

[linux-2.6-microblaze.git] / drivers / acpi / power.c

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 9b608b5..56102ea 100644 (file)
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -925,8 +925,7 @@ int acpi_add_power_resource(acpi_handle handle)
                return -ENOMEM;
 
        device = &resource->device;
-       acpi_init_device_object(device, handle, ACPI_BUS_TYPE_POWER,
-                               ACPI_STA_DEFAULT, NULL);
+       acpi_init_device_object(device, handle, ACPI_BUS_TYPE_POWER);
        mutex_init(&resource->resource_lock);
        INIT_LIST_HEAD(&resource->list_node);
        INIT_LIST_HEAD(&resource->dependents);
@@ -935,7 +934,7 @@ int acpi_add_power_resource(acpi_handle handle)
        strcpy(acpi_device_class(device), ACPI_POWER_CLASS);
        device->power.state = ACPI_STATE_UNKNOWN;
 
-       /* Evalute the object to get the system level and resource order. */
+       /* Evaluate the object to get the system level and resource order. */
        status = acpi_evaluate_object(handle, NULL, NULL, &buffer);
        if (ACPI_FAILURE(status))
                goto err;
@@ -996,6 +995,7 @@ void acpi_resume_power_resources(void)
 
        mutex_unlock(&power_resource_list_lock);
 }
+#endif
 
 void acpi_turn_off_unused_power_resources(void)
 {
@@ -1004,18 +1004,9 @@ void acpi_turn_off_unused_power_resources(void)
        mutex_lock(&power_resource_list_lock);
 
        list_for_each_entry_reverse(resource, &acpi_power_resource_list, list_node) {
-               int result, state;
-
                mutex_lock(&resource->resource_lock);
 
-               result = acpi_power_get_state(resource->device.handle, &state);
-               if (result) {
-                       mutex_unlock(&resource->resource_lock);
-                       continue;
-               }
-
-               if (state == ACPI_POWER_RESOURCE_STATE_ON
-                   && !resource->ref_count) {
+               if (!resource->ref_count) {
                        dev_info(&resource->device.dev, "Turning OFF\n");
                        __acpi_power_off(resource);
                }
@@ -1025,4 +1016,3 @@ void acpi_turn_off_unused_power_resources(void)
 
        mutex_unlock(&power_resource_list_lock);
 }
-#endif