Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (59 commits)
  ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework
  ACPI: fix resource check message
  ACPI / Battery: Update information on info notification and resume
  ACPI: Drop device flag wake_capable
  ACPI: Always check if _PRW is present before trying to evaluate it
  ACPI / PM: Check status of power resources under mutexes
  ACPI / PM: Rename acpi_power_off_device()
  ACPI / PM: Drop acpi_power_nocheck
  ACPI / PM: Drop acpi_bus_get_power()
  Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()
  ACPI / Fan: Rework the handling of power resources
  ACPI / PM: Register power resource devices as soon as they are needed
  ACPI / PM: Register acpi_power_driver early
  ACPI / PM: Add function for updating device power state consistently
  ACPI / PM: Add function for device power state initialization
  ACPI / PM: Introduce __acpi_bus_get_power()
  ACPI / PM: Introduce function for refcounting device power resources
  ACPI / PM: Add functions for manipulating lists of power resources
  ACPI / PM: Prevent acpi_power_get_inferred_state() from making changes
  ACPICA: Update version to 20101209
  ...

1 files changed, 7 insertions, 20 deletions

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 60049080c869..467479f07c1f 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -86,7 +86,7 @@ static int fan_get_cur_state(struct thermal_cooling_device *cdev, unsigned long
         if (!device)
                 return -EINVAL;
 
-        result = acpi_bus_get_power(device->handle, &acpi_state);
+        result = acpi_bus_update_power(device->handle, &acpi_state);
         if (result)
                 return result;
 
@@ -123,7 +123,6 @@ static struct thermal_cooling_device_ops fan_cooling_ops = {
 static int acpi_fan_add(struct acpi_device *device)
 {
         int result = 0;
-        int state = 0;
         struct thermal_cooling_device *cdev;
 
         if (!device)
@@ -132,16 +131,12 @@ static int acpi_fan_add(struct acpi_device *device)
         strcpy(acpi_device_name(device), "Fan");
         strcpy(acpi_device_class(device), ACPI_FAN_CLASS);
 
-        result = acpi_bus_get_power(device->handle, &state);
+        result = acpi_bus_update_power(device->handle, NULL);
         if (result) {
-                printk(KERN_ERR PREFIX "Reading power state\n");
+                printk(KERN_ERR PREFIX "Setting initial power state\n");
                 goto end;
         }
 
-        device->flags.force_power_state = 1;
-        acpi_bus_set_power(device->handle, state);
-        device->flags.force_power_state = 0;
-
         cdev = thermal_cooling_device_register("Fan", device,
                                                 &fan_cooling_ops);
         if (IS_ERR(cdev)) {
@@ -200,22 +195,14 @@ static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state)
 
 static int acpi_fan_resume(struct acpi_device *device)
 {
-        int result = 0;
-        int power_state = 0;
+        int result;
 
         if (!device)
                 return -EINVAL;
 
-        result = acpi_bus_get_power(device->handle, &power_state);
-        if (result) {
-                printk(KERN_ERR PREFIX
-                                  "Error reading fan power state\n");
-                return result;
-        }
-
-        device->flags.force_power_state = 1;
-        acpi_bus_set_power(device->handle, power_state);
-        device->flags.force_power_state = 0;
+        result = acpi_bus_update_power(device->handle, NULL);
+        if (result)
+                printk(KERN_ERR PREFIX "Error updating fan power state\n");
 
         return result;
 }