Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[linux-2.6.git] / drivers / char / i8k.c
index 1599456..40cc0cf 100644 (file)
@@ -5,6 +5,9 @@
  *
  * Copyright (C) 2001  Massimo Dal Zotto <dz@debian.org>
  *
+ * Hwmon integration:
+ * Copyright (C) 2011  Jean Delvare <khali@linux-fr.org>
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
  * Free Software Foundation; either version 2, or (at your option) any
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/dmi.h>
+#include <linux/capability.h>
+#include <linux/mutex.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
@@ -35,7 +42,8 @@
 #define I8K_SMM_GET_FAN                0x00a3
 #define I8K_SMM_GET_SPEED      0x02a3
 #define I8K_SMM_GET_TEMP       0x10a3
-#define I8K_SMM_GET_DELL_SIG   0xffa3
+#define I8K_SMM_GET_DELL_SIG1  0xfea3
+#define I8K_SMM_GET_DELL_SIG2  0xffa3
 #define I8K_SMM_BIOS_VERSION   0x00a6
 
 #define I8K_FAN_MULT           30
 
 #define I8K_TEMPERATURE_BUG    1
 
+static DEFINE_MUTEX(i8k_mutex);
 static char bios_version[4];
+static struct device *i8k_hwmon_dev;
 
 MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");
 MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops");
 MODULE_LICENSE("GPL");
 
-static int force;
+static bool force;
 module_param(force, bool, 0);
 MODULE_PARM_DESC(force, "Force loading without checking for supported models");
 
-static int ignore_dmi;
+static bool ignore_dmi;
 module_param(ignore_dmi, bool, 0);
 MODULE_PARM_DESC(ignore_dmi, "Continue probing hardware even if DMI data does not match");
 
-static int restricted;
+static bool restricted;
 module_param(restricted, bool, 0);
 MODULE_PARM_DESC(restricted, "Allow fan control if SYS_ADMIN capability set");
 
-static int power_status;
+static bool power_status;
 module_param(power_status, bool, 0600);
 MODULE_PARM_DESC(power_status, "Report power status in /proc/i8k");
 
+static int fan_mult = I8K_FAN_MULT;
+module_param(fan_mult, int, 0);
+MODULE_PARM_DESC(fan_mult, "Factor to multiply fan speed with");
+
 static int i8k_open_fs(struct inode *inode, struct file *file);
-static int i8k_ioctl(struct inode *, struct file *, unsigned int,
-                    unsigned long);
+static long i8k_ioctl(struct file *, unsigned int, unsigned long);
 
-static struct file_operations i8k_fops = {
+static const struct file_operations i8k_fops = {
+       .owner          = THIS_MODULE,
        .open           = i8k_open_fs,
        .read           = seq_read,
        .llseek         = seq_lseek,
        .release        = single_release,
-       .ioctl          = i8k_ioctl,
+       .unlocked_ioctl = i8k_ioctl,
 };
 
-typedef struct {
+struct smm_regs {
        unsigned int eax;
        unsigned int ebx __attribute__ ((packed));
        unsigned int ecx __attribute__ ((packed));
        unsigned int edx __attribute__ ((packed));
        unsigned int esi __attribute__ ((packed));
        unsigned int edi __attribute__ ((packed));
-} SMMRegisters;
+};
 
-static inline char *i8k_get_dmi_data(int field)
+static inline const char *i8k_get_dmi_data(int field)
 {
-       return dmi_get_system_info(field) ? : "N/A";
+       const char *dmi_data = dmi_get_system_info(field);
+
+       return dmi_data && *dmi_data ? dmi_data : "?";
 }
 
 /*
  * Call the System Management Mode BIOS. Code provided by Jonathan Buzzard.
  */
-static int i8k_smm(SMMRegisters * regs)
+static int i8k_smm(struct smm_regs *regs)
 {
        int rc;
        int eax = regs->eax;
 
-       asm("pushl %%eax\n\t"
+#if defined(CONFIG_X86_64)
+       asm volatile("pushq %%rax\n\t"
+               "movl 0(%%rax),%%edx\n\t"
+               "pushq %%rdx\n\t"
+               "movl 4(%%rax),%%ebx\n\t"
+               "movl 8(%%rax),%%ecx\n\t"
+               "movl 12(%%rax),%%edx\n\t"
+               "movl 16(%%rax),%%esi\n\t"
+               "movl 20(%%rax),%%edi\n\t"
+               "popq %%rax\n\t"
+               "out %%al,$0xb2\n\t"
+               "out %%al,$0x84\n\t"
+               "xchgq %%rax,(%%rsp)\n\t"
+               "movl %%ebx,4(%%rax)\n\t"
+               "movl %%ecx,8(%%rax)\n\t"
+               "movl %%edx,12(%%rax)\n\t"
+               "movl %%esi,16(%%rax)\n\t"
+               "movl %%edi,20(%%rax)\n\t"
+               "popq %%rdx\n\t"
+               "movl %%edx,0(%%rax)\n\t"
+               "pushfq\n\t"
+               "popq %%rax\n\t"
+               "andl $1,%%eax\n"
+               :"=a"(rc)
+               :    "a"(regs)
+               :    "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
+#else
+       asm volatile("pushl %%eax\n\t"
            "movl 0(%%eax),%%edx\n\t"
            "push %%edx\n\t"
            "movl 4(%%eax),%%ebx\n\t"
@@ -130,13 +173,13 @@ static int i8k_smm(SMMRegisters * regs)
            "movl %%edx,0(%%eax)\n\t"
            "lahf\n\t"
            "shrl $8,%%eax\n\t"
-           "andl $1,%%eax\n":"=a"(rc)
+           "andl $1,%%eax\n"
+           :"=a"(rc)
            :    "a"(regs)
            :    "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
-
-       if ((rc != 0) || ((regs->eax & 0xffff) == 0xffff) || (regs->eax == eax)) {
+#endif
+       if (rc != 0 || (regs->eax & 0xffff) == 0xffff || regs->eax == eax)
                return -EINVAL;
-       }
 
        return 0;
 }
@@ -147,15 +190,9 @@ static int i8k_smm(SMMRegisters * regs)
  */
 static int i8k_get_bios_version(void)
 {
-       SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
-       int rc;
+       struct smm_regs regs = { .eax = I8K_SMM_BIOS_VERSION, };
 
-       regs.eax = I8K_SMM_BIOS_VERSION;
-       if ((rc = i8k_smm(&regs)) < 0) {
-               return rc;
-       }
-
-       return regs.eax;
+       return i8k_smm(&regs) ? : regs.eax;
 }
 
 /*
@@ -163,13 +200,11 @@ static int i8k_get_bios_version(void)
  */
 static int i8k_get_fn_status(void)
 {
-       SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
+       struct smm_regs regs = { .eax = I8K_SMM_FN_STATUS, };
        int rc;
 
-       regs.eax = I8K_SMM_FN_STATUS;
-       if ((rc = i8k_smm(&regs)) < 0) {
+       if ((rc = i8k_smm(&regs)) < 0)
                return rc;
-       }
 
        switch ((regs.eax >> I8K_FN_SHIFT) & I8K_FN_MASK) {
        case I8K_FN_UP:
@@ -188,20 +223,13 @@ static int i8k_get_fn_status(void)
  */
 static int i8k_get_power_status(void)
 {
-       SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
+       struct smm_regs regs = { .eax = I8K_SMM_POWER_STATUS, };
        int rc;
 
-       regs.eax = I8K_SMM_POWER_STATUS;
-       if ((rc = i8k_smm(&regs)) < 0) {
+       if ((rc = i8k_smm(&regs)) < 0)
                return rc;
-       }
 
-       switch (regs.eax & 0xff) {
-       case I8K_POWER_AC:
-               return I8K_AC;
-       default:
-               return I8K_BATTERY;
-       }
+       return (regs.eax & 0xff) == I8K_POWER_AC ? I8K_AC : I8K_BATTERY;
 }
 
 /*
@@ -209,16 +237,10 @@ static int i8k_get_power_status(void)
  */
 static int i8k_get_fan_status(int fan)
 {
-       SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
-       int rc;
+       struct smm_regs regs = { .eax = I8K_SMM_GET_FAN, };
 
-       regs.eax = I8K_SMM_GET_FAN;
        regs.ebx = fan & 0xff;
-       if ((rc = i8k_smm(&regs)) < 0) {
-               return rc;
-       }
-
-       return (regs.eax & 0xff);
+       return i8k_smm(&regs) ? : regs.eax & 0xff;
 }
 
 /*
@@ -226,16 +248,10 @@ static int i8k_get_fan_status(int fan)
  */
 static int i8k_get_fan_speed(int fan)
 {
-       SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
-       int rc;
+       struct smm_regs regs = { .eax = I8K_SMM_GET_SPEED, };
 
-       regs.eax = I8K_SMM_GET_SPEED;
        regs.ebx = fan & 0xff;
-       if ((rc = i8k_smm(&regs)) < 0) {
-               return rc;
-       }
-
-       return (regs.eax & 0xffff) * I8K_FAN_MULT;
+       return i8k_smm(&regs) ? : (regs.eax & 0xffff) * fan_mult;
 }
 
 /*
@@ -243,37 +259,30 @@ static int i8k_get_fan_speed(int fan)
  */
 static int i8k_set_fan(int fan, int speed)
 {
-       SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
-       int rc;
+       struct smm_regs regs = { .eax = I8K_SMM_SET_FAN, };
 
        speed = (speed < 0) ? 0 : ((speed > I8K_FAN_MAX) ? I8K_FAN_MAX : speed);
-
-       regs.eax = I8K_SMM_SET_FAN;
        regs.ebx = (fan & 0xff) | (speed << 8);
-       if ((rc = i8k_smm(&regs)) < 0) {
-               return rc;
-       }
 
-       return (i8k_get_fan_status(fan));
+       return i8k_smm(&regs) ? : i8k_get_fan_status(fan);
 }
 
 /*
  * Read the cpu temperature.
  */
-static int i8k_get_cpu_temp(void)
+static int i8k_get_temp(int sensor)
 {
-       SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
+       struct smm_regs regs = { .eax = I8K_SMM_GET_TEMP, };
        int rc;
        int temp;
 
 #ifdef I8K_TEMPERATURE_BUG
-       static int prev = 0;
+       static int prev;
 #endif
-
-       regs.eax = I8K_SMM_GET_TEMP;
-       if ((rc = i8k_smm(&regs)) < 0) {
+       regs.ebx = sensor & 0xff;
+       if ((rc = i8k_smm(&regs)) < 0)
                return rc;
-       }
+
        temp = regs.eax & 0xff;
 
 #ifdef I8K_TEMPERATURE_BUG
@@ -295,25 +304,19 @@ static int i8k_get_cpu_temp(void)
        return temp;
 }
 
-static int i8k_get_dell_signature(void)
+static int i8k_get_dell_signature(int req_fn)
 {
-       SMMRegisters regs = { 0, 0, 0, 0, 0, 0 };
+       struct smm_regs regs = { .eax = req_fn, };
        int rc;
 
-       regs.eax = I8K_SMM_GET_DELL_SIG;
-       if ((rc = i8k_smm(&regs)) < 0) {
+       if ((rc = i8k_smm(&regs)) < 0)
                return rc;
-       }
 
-       if ((regs.eax == 1145651527) && (regs.edx == 1145392204)) {
-               return 0;
-       } else {
-               return -1;
-       }
+       return regs.eax == 1145651527 && regs.edx == 1145392204 ? 0 : -1;
 }
 
-static int i8k_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
-                    unsigned long arg)
+static int
+i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg)
 {
        int val = 0;
        int speed;
@@ -342,33 +345,33 @@ static int i8k_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
                break;
 
        case I8K_GET_TEMP:
-               val = i8k_get_cpu_temp();
+               val = i8k_get_temp(0);
                break;
 
        case I8K_GET_SPEED:
-               if (copy_from_user(&val, argp, sizeof(int))) {
+               if (copy_from_user(&val, argp, sizeof(int)))
                        return -EFAULT;
-               }
+
                val = i8k_get_fan_speed(val);
                break;
 
        case I8K_GET_FAN:
-               if (copy_from_user(&val, argp, sizeof(int))) {
+               if (copy_from_user(&val, argp, sizeof(int)))
                        return -EFAULT;
-               }
+
                val = i8k_get_fan_status(val);
                break;
 
        case I8K_SET_FAN:
-               if (restricted && !capable(CAP_SYS_ADMIN)) {
+               if (restricted && !capable(CAP_SYS_ADMIN))
                        return -EPERM;
-               }
-               if (copy_from_user(&val, argp, sizeof(int))) {
+
+               if (copy_from_user(&val, argp, sizeof(int)))
                        return -EFAULT;
-               }
-               if (copy_from_user(&speed, argp + 1, sizeof(int))) {
+
+               if (copy_from_user(&speed, argp + 1, sizeof(int)))
                        return -EFAULT;
-               }
+
                val = i8k_set_fan(val, speed);
                break;
 
@@ -376,31 +379,41 @@ static int i8k_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
                return -EINVAL;
        }
 
-       if (val < 0) {
+       if (val < 0)
                return val;
-       }
 
        switch (cmd) {
        case I8K_BIOS_VERSION:
-               if (copy_to_user(argp, &val, 4)) {
+               if (copy_to_user(argp, &val, 4))
                        return -EFAULT;
-               }
+
                break;
        case I8K_MACHINE_ID:
-               if (copy_to_user(argp, buff, 16)) {
+               if (copy_to_user(argp, buff, 16))
                        return -EFAULT;
-               }
+
                break;
        default:
-               if (copy_to_user(argp, &val, sizeof(int))) {
+               if (copy_to_user(argp, &val, sizeof(int)))
                        return -EFAULT;
-               }
+
                break;
        }
 
        return 0;
 }
 
+static long i8k_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
+{
+       long ret;
+
+       mutex_lock(&i8k_mutex);
+       ret = i8k_ioctl_unlocked(fp, cmd, arg);
+       mutex_unlock(&i8k_mutex);
+
+       return ret;
+}
+
 /*
  * Print the information for /proc/i8k.
  */
@@ -409,17 +422,16 @@ static int i8k_proc_show(struct seq_file *seq, void *offset)
        int fn_key, cpu_temp, ac_power;
        int left_fan, right_fan, left_speed, right_speed;
 
-       cpu_temp        = i8k_get_cpu_temp();                   /* 11100 µs */
-       left_fan        = i8k_get_fan_status(I8K_FAN_LEFT);     /*   580 µs */
-       right_fan       = i8k_get_fan_status(I8K_FAN_RIGHT);    /*   580 µs */
-       left_speed      = i8k_get_fan_speed(I8K_FAN_LEFT);      /*   580 µs */
-       right_speed     = i8k_get_fan_speed(I8K_FAN_RIGHT);     /*   580 µs */
-       fn_key          = i8k_get_fn_status();                  /*   750 µs */
-       if (power_status) {
-               ac_power = i8k_get_power_status();              /* 14700 µs */
-       } else {
+       cpu_temp        = i8k_get_temp(0);                      /* 11100 µs */
+       left_fan        = i8k_get_fan_status(I8K_FAN_LEFT);     /*   580 µs */
+       right_fan       = i8k_get_fan_status(I8K_FAN_RIGHT);    /*   580 µs */
+       left_speed      = i8k_get_fan_speed(I8K_FAN_LEFT);      /*   580 µs */
+       right_speed     = i8k_get_fan_speed(I8K_FAN_RIGHT);     /*   580 µs */
+       fn_key          = i8k_get_fn_status();                  /*   750 µs */
+       if (power_status)
+               ac_power = i8k_get_power_status();              /* 14700 µs */
+       else
                ac_power = -1;
-       }
 
        /*
         * Info:
@@ -438,7 +450,7 @@ static int i8k_proc_show(struct seq_file *seq, void *offset)
        return seq_printf(seq, "%s %s %s %d %d %d %d %d %d %d\n",
                          I8K_PROC_FMT,
                          bios_version,
-                         dmi_get_system_info(DMI_PRODUCT_SERIAL) ? : "N/A",
+                         i8k_get_dmi_data(DMI_PRODUCT_SERIAL),
                          cpu_temp,
                          left_fan, right_fan, left_speed, right_speed,
                          ac_power, fn_key);
@@ -449,6 +461,152 @@ static int i8k_open_fs(struct inode *inode, struct file *file)
        return single_open(file, i8k_proc_show, NULL);
 }
 
+
+/*
+ * Hwmon interface
+ */
+
+static ssize_t i8k_hwmon_show_temp(struct device *dev,
+                                  struct device_attribute *devattr,
+                                  char *buf)
+{
+       int cpu_temp;
+
+       cpu_temp = i8k_get_temp(0);
+       if (cpu_temp < 0)
+               return cpu_temp;
+       return sprintf(buf, "%d\n", cpu_temp * 1000);
+}
+
+static ssize_t i8k_hwmon_show_fan(struct device *dev,
+                                 struct device_attribute *devattr,
+                                 char *buf)
+{
+       int index = to_sensor_dev_attr(devattr)->index;
+       int fan_speed;
+
+       fan_speed = i8k_get_fan_speed(index);
+       if (fan_speed < 0)
+               return fan_speed;
+       return sprintf(buf, "%d\n", fan_speed);
+}
+
+static ssize_t i8k_hwmon_show_label(struct device *dev,
+                                   struct device_attribute *devattr,
+                                   char *buf)
+{
+       static const char *labels[4] = {
+               "i8k",
+               "CPU",
+               "Left Fan",
+               "Right Fan",
+       };
+       int index = to_sensor_dev_attr(devattr)->index;
+
+       return sprintf(buf, "%s\n", labels[index]);
+}
+
+static DEVICE_ATTR(temp1_input, S_IRUGO, i8k_hwmon_show_temp, NULL);
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, i8k_hwmon_show_fan, NULL,
+                         I8K_FAN_LEFT);
+static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, i8k_hwmon_show_fan, NULL,
+                         I8K_FAN_RIGHT);
+static SENSOR_DEVICE_ATTR(name, S_IRUGO, i8k_hwmon_show_label, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, i8k_hwmon_show_label, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan1_label, S_IRUGO, i8k_hwmon_show_label, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan2_label, S_IRUGO, i8k_hwmon_show_label, NULL, 3);
+
+static void i8k_hwmon_remove_files(struct device *dev)
+{
+       device_remove_file(dev, &dev_attr_temp1_input);
+       device_remove_file(dev, &sensor_dev_attr_fan1_input.dev_attr);
+       device_remove_file(dev, &sensor_dev_attr_fan2_input.dev_attr);
+       device_remove_file(dev, &sensor_dev_attr_temp1_label.dev_attr);
+       device_remove_file(dev, &sensor_dev_attr_fan1_label.dev_attr);
+       device_remove_file(dev, &sensor_dev_attr_fan2_label.dev_attr);
+       device_remove_file(dev, &sensor_dev_attr_name.dev_attr);
+}
+
+static int __init i8k_init_hwmon(void)
+{
+       int err;
+
+       i8k_hwmon_dev = hwmon_device_register(NULL);
+       if (IS_ERR(i8k_hwmon_dev)) {
+               err = PTR_ERR(i8k_hwmon_dev);
+               i8k_hwmon_dev = NULL;
+               printk(KERN_ERR "i8k: hwmon registration failed (%d)\n", err);
+               return err;
+       }
+
+       /* Required name attribute */
+       err = device_create_file(i8k_hwmon_dev,
+                                &sensor_dev_attr_name.dev_attr);
+       if (err)
+               goto exit_unregister;
+
+       /* CPU temperature attributes, if temperature reading is OK */
+       err = i8k_get_temp(0);
+       if (err < 0) {
+               dev_dbg(i8k_hwmon_dev,
+                       "Not creating temperature attributes (%d)\n", err);
+       } else {
+               err = device_create_file(i8k_hwmon_dev, &dev_attr_temp1_input);
+               if (err)
+                       goto exit_remove_files;
+               err = device_create_file(i8k_hwmon_dev,
+                                        &sensor_dev_attr_temp1_label.dev_attr);
+               if (err)
+                       goto exit_remove_files;
+       }
+
+       /* Left fan attributes, if left fan is present */
+       err = i8k_get_fan_status(I8K_FAN_LEFT);
+       if (err < 0) {
+               dev_dbg(i8k_hwmon_dev,
+                       "Not creating %s fan attributes (%d)\n", "left", err);
+       } else {
+               err = device_create_file(i8k_hwmon_dev,
+                                        &sensor_dev_attr_fan1_input.dev_attr);
+               if (err)
+                       goto exit_remove_files;
+               err = device_create_file(i8k_hwmon_dev,
+                                        &sensor_dev_attr_fan1_label.dev_attr);
+               if (err)
+                       goto exit_remove_files;
+       }
+
+       /* Right fan attributes, if right fan is present */
+       err = i8k_get_fan_status(I8K_FAN_RIGHT);
+       if (err < 0) {
+               dev_dbg(i8k_hwmon_dev,
+                       "Not creating %s fan attributes (%d)\n", "right", err);
+       } else {
+               err = device_create_file(i8k_hwmon_dev,
+                                        &sensor_dev_attr_fan2_input.dev_attr);
+               if (err)
+                       goto exit_remove_files;
+               err = device_create_file(i8k_hwmon_dev,
+                                        &sensor_dev_attr_fan2_label.dev_attr);
+               if (err)
+                       goto exit_remove_files;
+       }
+
+       return 0;
+
+ exit_remove_files:
+       i8k_hwmon_remove_files(i8k_hwmon_dev);
+ exit_unregister:
+       hwmon_device_unregister(i8k_hwmon_dev);
+       return err;
+}
+
+static void __exit i8k_exit_hwmon(void)
+{
+       i8k_hwmon_remove_files(i8k_hwmon_dev);
+       hwmon_device_unregister(i8k_hwmon_dev);
+}
+
 static struct dmi_system_id __initdata i8k_dmi_table[] = {
        {
                .ident = "Dell Inspiron",
@@ -464,7 +622,49 @@ static struct dmi_system_id __initdata i8k_dmi_table[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "Latitude"),
                },
        },
-       { }
+       {
+               .ident = "Dell Inspiron 2",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron"),
+               },
+       },
+       {
+               .ident = "Dell Latitude 2",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Latitude"),
+               },
+       },
+       {       /* UK Inspiron 6400  */
+               .ident = "Dell Inspiron 3",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "MM061"),
+               },
+       },
+       {
+               .ident = "Dell Inspiron 3",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "MP061"),
+               },
+       },
+       {
+               .ident = "Dell Precision",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Precision"),
+               },
+       },
+       {
+               .ident = "Dell Vostro",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Vostro"),
+               },
+       },
+        { }
 };
 
 /*
@@ -494,7 +694,8 @@ static int __init i8k_probe(void)
        /*
         * Get SMM Dell signature
         */
-       if (i8k_get_dell_signature() != 0) {
+       if (i8k_get_dell_signature(I8K_SMM_GET_DELL_SIG1) &&
+           i8k_get_dell_signature(I8K_SMM_GET_DELL_SIG2)) {
                printk(KERN_ERR "i8k: unable to get SMM Dell signature\n");
                if (!force)
                        return -ENODEV;
@@ -528,45 +729,40 @@ static int __init i8k_probe(void)
        return 0;
 }
 
-#ifdef MODULE
-static
-#endif
-int __init i8k_init(void)
+static int __init i8k_init(void)
 {
        struct proc_dir_entry *proc_i8k;
+       int err;
 
        /* Are we running on an supported laptop? */
        if (i8k_probe())
                return -ENODEV;
 
        /* Register the proc entry */
-       proc_i8k = create_proc_entry("i8k", 0, NULL);
+       proc_i8k = proc_create("i8k", 0, NULL, &i8k_fops);
        if (!proc_i8k)
                return -ENOENT;
 
-       proc_i8k->proc_fops = &i8k_fops;
-       proc_i8k->owner = THIS_MODULE;
+       err = i8k_init_hwmon();
+       if (err)
+               goto exit_remove_proc;
 
        printk(KERN_INFO
               "Dell laptop SMM driver v%s Massimo Dal Zotto (dz@debian.org)\n",
               I8K_VERSION);
 
        return 0;
-}
 
-#ifdef MODULE
-int init_module(void)
-{
-       return i8k_init();
+ exit_remove_proc:
+       remove_proc_entry("i8k", NULL);
+       return err;
 }
 
-void cleanup_module(void)
+static void __exit i8k_exit(void)
 {
-       /* Remove the proc entry */
+       i8k_exit_hwmon();
        remove_proc_entry("i8k", NULL);
-
-       printk(KERN_INFO "i8k: module unloaded\n");
 }
-#endif
 
-/* end of file */
+module_init(i8k_init);
+module_exit(i8k_exit);