1 files changed, 7 insertions, 65 deletions

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index c81f6bdb68b8..a5a5532db268 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -47,8 +47,6 @@ 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},
@@ -63,15 +61,9 @@ static struct acpi_driver acpi_fan_driver = {
         .ops = {
                 .add = acpi_fan_add,
                 .remove = acpi_fan_remove,
-                .suspend = acpi_fan_suspend,
-                .resume = acpi_fan_resume,
                 },
 };
 
-struct acpi_fan {
-        struct acpi_device * device;
-};
-
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
@@ -80,12 +72,12 @@ static struct proc_dir_entry *acpi_fan_dir;
 
 static int acpi_fan_read_state(struct seq_file *seq, void *offset)
 {
-        struct acpi_fan *fan = seq->private;
+        struct acpi_device *device = seq->private;
         int state = 0;
 
 
-        if (fan) {
-                if (acpi_bus_get_power(fan->device->handle, &state))
+        if (device) {
+                if (acpi_bus_get_power(device->handle, &state))
                         seq_printf(seq, "status:                  ERROR\n");
                 else
                         seq_printf(seq, "status:                  %s\n",
@@ -105,11 +97,10 @@ acpi_fan_write_state(struct file *file, const char __user * buffer,
 {
         int result = 0;
         struct seq_file *m = file->private_data;
-        struct acpi_fan *fan = m->private;
+        struct acpi_device *device = m->private;
         char state_string[12] = { '\0' };
 
-
-        if (!fan || (count > sizeof(state_string) - 1))
+        if (count > sizeof(state_string) - 1)
                 return -EINVAL;
 
         if (copy_from_user(state_string, buffer, count))
@@ -117,7 +108,7 @@ acpi_fan_write_state(struct file *file, const char __user * buffer,
 
         state_string[count] = '\0';
 
-        result = acpi_bus_set_power(fan->device->handle,
+        result = acpi_bus_set_power(device->handle,
                                     simple_strtoul(state_string, NULL, 0));
         if (result)
                 return result;
@@ -158,7 +149,7 @@ static int acpi_fan_add_fs(struct acpi_device *device)
                 return -ENODEV;
         else {
                 entry->proc_fops = &acpi_fan_state_ops;
-                entry->data = acpi_driver_data(device);
+                entry->data = device;
                 entry->owner = THIS_MODULE;
         }
 
@@ -191,14 +182,8 @@ static int acpi_fan_add(struct acpi_device *device)
         if (!device)
                 return -EINVAL;
 
-        fan = kzalloc(sizeof(struct acpi_fan), GFP_KERNEL);
-        if (!fan)
-                return -ENOMEM;
-
-        fan->device = device;
         strcpy(acpi_device_name(device), "Fan");
         strcpy(acpi_device_class(device), ACPI_FAN_CLASS);
-        acpi_driver_data(device) = fan;
 
         result = acpi_bus_get_power(device->handle, &state);
         if (result) {
@@ -206,10 +191,6 @@ 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;
@@ -227,53 +208,14 @@ static int acpi_fan_add(struct acpi_device *device)
 
 static int acpi_fan_remove(struct acpi_device *device, int type)
 {
-        struct acpi_fan *fan = NULL;
-
-
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
 
-        fan = acpi_driver_data(device);
-
         acpi_fan_remove_fs(device);
 
-        kfree(fan);
-
         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;