Revert "ACPI: Fan: Drop force_power_state acpi_device option"

This reverts commit 93ad7c07ad487b036add8760dabcc35666a550ef.

http://bugzilla.kernel.org/show_bug.cgi?id=9798

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 40 insertions, 0 deletions

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index a5a5532db268..a6e149d692cb 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -47,6 +47,8 @@ MODULE_LICENSE("GPL");
 
 static int acpi_fan_add(struct acpi_device *device);
 static int acpi_fan_remove(struct acpi_device *device, int type);
+static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state);
+static int acpi_fan_resume(struct acpi_device *device);
 
 static const struct acpi_device_id fan_device_ids[] = {
         {"PNP0C0B", 0},
@@ -61,6 +63,8 @@ static struct acpi_driver acpi_fan_driver = {
         .ops = {
                 .add = acpi_fan_add,
                 .remove = acpi_fan_remove,
+                .suspend = acpi_fan_suspend,
+                .resume = acpi_fan_resume,
                 },
 };
 
@@ -191,6 +195,10 @@ static int acpi_fan_add(struct acpi_device *device)
                 goto end;
         }
 
+        device->flags.force_power_state = 1;
+        acpi_bus_set_power(device->handle, state);
+        device->flags.force_power_state = 0;
+
         result = acpi_fan_add_fs(device);
         if (result)
                 goto end;
@@ -216,6 +224,38 @@ static int acpi_fan_remove(struct acpi_device *device, int type)
         return 0;
 }
 
+static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state)
+{
+        if (!device)
+                return -EINVAL;
+
+        acpi_bus_set_power(device->handle, ACPI_STATE_D0);
+
+        return AE_OK;
+}
+
+static int acpi_fan_resume(struct acpi_device *device)
+{
+        int result = 0;
+        int power_state = 0;
+
+        if (!device)
+                return -EINVAL;
+
+        result = acpi_bus_get_power(device->handle, &power_state);
+        if (result) {
+                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                  "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;
+
+        return result;
+}
+
 static int __init acpi_fan_init(void)
 {
         int result = 0;