Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[safe/jmp/linux-2.6] / drivers / acpi / fan.c
index 2ee1d06..acf2ab2 100644 (file)
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <asm/uaccess.h>
-
+#include <linux/thermal.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 
+#define PREFIX "ACPI: "
 
-#define ACPI_FAN_COMPONENT             0x00200000
 #define ACPI_FAN_CLASS                 "fan"
-#define ACPI_FAN_DRIVER_NAME           "ACPI Fan Driver"
 #define ACPI_FAN_FILE_STATE            "state"
 
 #define _COMPONENT             ACPI_FAN_COMPONENT
-ACPI_MODULE_NAME               ("acpi_fan")
+ACPI_MODULE_NAME("fan");
 
 MODULE_AUTHOR("Paul Diefenbaugh");
-MODULE_DESCRIPTION(ACPI_FAN_DRIVER_NAME);
+MODULE_DESCRIPTION("ACPI Fan Driver");
 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_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 struct acpi_driver acpi_fan_driver = {
-       .name =         ACPI_FAN_DRIVER_NAME,
-       .class =        ACPI_FAN_CLASS,
-       .ids =          "PNP0C0B",
-       .ops =          {
-                               .add =          acpi_fan_add,
-                               .remove =       acpi_fan_remove,
-                       },
+static const struct acpi_device_id fan_device_ids[] = {
+       {"PNP0C0B", 0},
+       {"", 0},
 };
+MODULE_DEVICE_TABLE(acpi, fan_device_ids);
 
-struct acpi_fan {
-       acpi_handle             handle;
+static struct acpi_driver acpi_fan_driver = {
+       .name = "fan",
+       .class = ACPI_FAN_CLASS,
+       .ids = fan_device_ids,
+       .ops = {
+               .add = acpi_fan_add,
+               .remove = acpi_fan_remove,
+               .suspend = acpi_fan_suspend,
+               .resume = acpi_fan_resume,
+               },
 };
 
+/* thermal cooling device callbacks */
+static int fan_get_max_state(struct thermal_cooling_device *cdev, unsigned long
+                            *state)
+{
+       /* ACPI fan device only support two states: ON/OFF */
+       *state = 1;
+       return 0;
+}
+
+static int fan_get_cur_state(struct thermal_cooling_device *cdev, unsigned long
+                            *state)
+{
+       struct acpi_device *device = cdev->devdata;
+       int result;
+       int acpi_state;
+
+       if (!device)
+               return -EINVAL;
+
+       result = acpi_bus_get_power(device->handle, &acpi_state);
+       if (result)
+               return result;
+
+       *state = (acpi_state == ACPI_STATE_D3 ? 0 :
+                (acpi_state == ACPI_STATE_D0 ? 1 : -1));
+       return 0;
+}
+
+static int
+fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state)
+{
+       struct acpi_device *device = cdev->devdata;
+       int result;
+
+       if (!device || (state != 0 && state != 1))
+               return -EINVAL;
+
+       result = acpi_bus_set_power(device->handle,
+                               state ? ACPI_STATE_D0 : ACPI_STATE_D3);
+
+       return result;
+}
+
+static struct thermal_cooling_device_ops fan_cooling_ops = {
+       .get_max_state = fan_get_max_state,
+       .get_cur_state = fan_get_cur_state,
+       .set_cur_state = fan_set_cur_state,
+};
 
 /* --------------------------------------------------------------------------
                               FS Interface (/proc)
    -------------------------------------------------------------------------- */
+#ifdef CONFIG_ACPI_PROCFS
 
-static struct proc_dir_entry   *acpi_fan_dir;
-
+static struct proc_dir_entry *acpi_fan_dir;
 
-static int
-acpi_fan_read_state(struct seq_file *seq, void *offset)
+static int acpi_fan_read_state(struct seq_file *seq, void *offset)
 {
-       struct acpi_fan         *fan = seq->private;
-       int                     state = 0;
+       struct acpi_device *device = seq->private;
+       int state = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_fan_read_state");
 
-       if (fan) {
-               if (acpi_bus_get_power(fan->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",
-                                    !state?"on":"off");
+                                  !state ? "on" : "off");
        }
-       return_VALUE(0);
+       return 0;
 }
 
 static int acpi_fan_state_open_fs(struct inode *inode, struct file *file)
@@ -96,196 +147,231 @@ static int acpi_fan_state_open_fs(struct inode *inode, struct file *file)
 }
 
 static ssize_t
-acpi_fan_write_state(struct file *file, const char __user *buffer, 
-                    size_t count, loff_t *ppos)
+acpi_fan_write_state(struct file *file, const char __user * buffer,
+                    size_t count, loff_t * ppos)
 {
-       int                     result = 0;
-       struct seq_file         *m = (struct seq_file *)file->private_data;
-       struct acpi_fan         *fan = (struct acpi_fan *) m->private;
-       char                    state_string[12] = {'\0'};
+       int result = 0;
+       struct seq_file *m = file->private_data;
+       struct acpi_device *device = m->private;
+       char state_string[3] = { '\0' };
 
-       ACPI_FUNCTION_TRACE("acpi_fan_write_state");
+       if (count > sizeof(state_string) - 1)
+               return -EINVAL;
 
-       if (!fan || (count > sizeof(state_string) - 1))
-               return_VALUE(-EINVAL);
-       
        if (copy_from_user(state_string, buffer, count))
-               return_VALUE(-EFAULT);
-       
+               return -EFAULT;
+
        state_string[count] = '\0';
-       
-       result = acpi_bus_set_power(fan->handle, 
-               simple_strtoul(state_string, NULL, 0));
+       if ((state_string[0] < '0') || (state_string[0] > '3'))
+               return -EINVAL;
+       if (state_string[1] == '\n')
+               state_string[1] = '\0';
+       if (state_string[1] != '\0')
+               return -EINVAL;
+
+       result = acpi_bus_set_power(device->handle,
+                                   simple_strtoul(state_string, NULL, 0));
        if (result)
-               return_VALUE(result);
+               return result;
 
-       return_VALUE(count);
+       return count;
 }
 
-static struct file_operations acpi_fan_state_ops = {
-       .open           = acpi_fan_state_open_fs,
-       .read           = seq_read,
-       .write          = acpi_fan_write_state,
-       .llseek         = seq_lseek,
-       .release        = single_release,
+static const struct file_operations acpi_fan_state_ops = {
+       .open = acpi_fan_state_open_fs,
+       .read = seq_read,
+       .write = acpi_fan_write_state,
+       .llseek = seq_lseek,
+       .release = single_release,
        .owner = THIS_MODULE,
 };
 
-static int
-acpi_fan_add_fs(struct acpi_device *device)
+static int acpi_fan_add_fs(struct acpi_device *device)
 {
-       struct proc_dir_entry   *entry = NULL;
+       struct proc_dir_entry *entry = NULL;
 
-       ACPI_FUNCTION_TRACE("acpi_fan_add_fs");
 
        if (!device)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
        if (!acpi_device_dir(device)) {
                acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),
-                       acpi_fan_dir);
+                                                    acpi_fan_dir);
                if (!acpi_device_dir(device))
-                       return_VALUE(-ENODEV);
-               acpi_device_dir(device)->owner = THIS_MODULE;
+                       return -ENODEV;
        }
 
        /* 'status' [R/W] */
-       entry = create_proc_entry(ACPI_FAN_FILE_STATE,
-               S_IFREG|S_IRUGO|S_IWUSR, acpi_device_dir(device));
+       entry = proc_create_data(ACPI_FAN_FILE_STATE,
+                                S_IFREG | S_IRUGO | S_IWUSR,
+                                acpi_device_dir(device),
+                                &acpi_fan_state_ops,
+                                device);
        if (!entry)
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Unable to create '%s' fs entry\n",
-                       ACPI_FAN_FILE_STATE));
-       else {
-               entry->proc_fops = &acpi_fan_state_ops;
-               entry->data = acpi_driver_data(device);
-               entry->owner = THIS_MODULE;
-       }
-
-       return_VALUE(0);
+               return -ENODEV;
+       return 0;
 }
 
-
-static int
-acpi_fan_remove_fs(struct acpi_device *device)
+static int acpi_fan_remove_fs(struct acpi_device *device)
 {
-       ACPI_FUNCTION_TRACE("acpi_fan_remove_fs");
 
        if (acpi_device_dir(device)) {
-               remove_proc_entry(ACPI_FAN_FILE_STATE,
-                                 acpi_device_dir(device));
+               remove_proc_entry(ACPI_FAN_FILE_STATE, acpi_device_dir(device));
                remove_proc_entry(acpi_device_bid(device), acpi_fan_dir);
                acpi_device_dir(device) = NULL;
        }
 
-       return_VALUE(0);
+       return 0;
+}
+#else
+static int acpi_fan_add_fs(struct acpi_device *device)
+{
+       return 0;
 }
 
-
+static int acpi_fan_remove_fs(struct acpi_device *device)
+{
+       return 0;
+}
+#endif
 /* --------------------------------------------------------------------------
                                  Driver Interface
    -------------------------------------------------------------------------- */
 
-static int
-acpi_fan_add(struct acpi_device *device)
+static int acpi_fan_add(struct acpi_device *device)
 {
-       int                     result = 0;
-       struct acpi_fan         *fan = NULL;
-       int                     state = 0;
-
-       ACPI_FUNCTION_TRACE("acpi_fan_add");
+       int result = 0;
+       int state = 0;
+       struct thermal_cooling_device *cdev;
 
        if (!device)
-               return_VALUE(-EINVAL);
+               return -EINVAL;
 
-       fan = kmalloc(sizeof(struct acpi_fan), GFP_KERNEL);
-       if (!fan)
-               return_VALUE(-ENOMEM);
-       memset(fan, 0, sizeof(struct acpi_fan));
-
-       fan->handle = device->handle;
        strcpy(acpi_device_name(device), "Fan");
        strcpy(acpi_device_class(device), ACPI_FAN_CLASS);
-       acpi_driver_data(device) = fan;
 
-       result = acpi_bus_get_power(fan->handle, &state);
+       result = acpi_bus_get_power(device->handle, &state);
        if (result) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                       "Error reading power state\n"));
+               printk(KERN_ERR PREFIX "Reading 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)) {
+               result = PTR_ERR(cdev);
+               goto end;
+       }
+
+       dev_dbg(&device->dev, "registered as cooling_device%d\n", cdev->id);
+
+       device->driver_data = cdev;
+       result = sysfs_create_link(&device->dev.kobj,
+                                  &cdev->device.kobj,
+                                  "thermal_cooling");
+       if (result)
+               dev_err(&device->dev, "Failed to create sysfs link "
+                       "'thermal_cooling'\n");
+
+       result = sysfs_create_link(&cdev->device.kobj,
+                                  &device->dev.kobj,
+                                  "device");
+       if (result)
+               dev_err(&device->dev, "Failed to create sysfs link "
+                       "'device'\n");
+
        result = acpi_fan_add_fs(device);
        if (result)
                goto end;
 
        printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
-               acpi_device_name(device), acpi_device_bid(device),
-               !device->power.state?"on":"off");
+              acpi_device_name(device), acpi_device_bid(device),
+              !device->power.state ? "on" : "off");
 
-end:
-       if (result)
-               kfree(fan);
-
-       return_VALUE(result);
+      end:
+       return result;
 }
 
-
-static int
-acpi_fan_remove(struct acpi_device *device, int type)
+static int acpi_fan_remove(struct acpi_device *device, int type)
 {
-       struct acpi_fan *fan = NULL;
+       struct thermal_cooling_device *cdev = acpi_driver_data(device);
 
-       ACPI_FUNCTION_TRACE("acpi_fan_remove");
+       if (!device || !cdev)
+               return -EINVAL;
 
-       if (!device || !acpi_driver_data(device))
-               return_VALUE(-EINVAL);
+       acpi_fan_remove_fs(device);
+       sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
+       sysfs_remove_link(&cdev->device.kobj, "device");
+       thermal_cooling_device_unregister(cdev);
 
-       fan = (struct acpi_fan *) acpi_driver_data(device);
+       return 0;
+}
 
-       acpi_fan_remove_fs(device);
+static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state)
+{
+       if (!device)
+               return -EINVAL;
 
-       kfree(fan);
+       acpi_bus_set_power(device->handle, ACPI_STATE_D0);
 
-       return_VALUE(0);
+       return AE_OK;
 }
 
+static int acpi_fan_resume(struct acpi_device *device)
+{
+       int result = 0;
+       int power_state = 0;
+
+       if (!device)
+               return -EINVAL;
 
-static int __init
-acpi_fan_init(void)
+       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;
+
+       return result;
+}
+
+static int __init acpi_fan_init(void)
 {
        int result = 0;
 
-       ACPI_FUNCTION_TRACE("acpi_fan_init");
 
+#ifdef CONFIG_ACPI_PROCFS
        acpi_fan_dir = proc_mkdir(ACPI_FAN_CLASS, acpi_root_dir);
        if (!acpi_fan_dir)
-               return_VALUE(-ENODEV);
-       acpi_fan_dir->owner = THIS_MODULE;
+               return -ENODEV;
+#endif
 
        result = acpi_bus_register_driver(&acpi_fan_driver);
        if (result < 0) {
                remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir);
-               return_VALUE(-ENODEV);
+               return -ENODEV;
        }
 
-       return_VALUE(0);
+       return 0;
 }
 
-
-static void __exit
-acpi_fan_exit(void)
+static void __exit acpi_fan_exit(void)
 {
-       ACPI_FUNCTION_TRACE("acpi_fan_exit");
 
        acpi_bus_unregister_driver(&acpi_fan_driver);
 
        remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir);
 
-       return_VOID;
+       return;
 }
 
-
 module_init(acpi_fan_init);
 module_exit(acpi_fan_exit);
-