]> Pileus Git - ~andy/linux/blobdiff - drivers/char/i8k.c
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
[~andy/linux] / drivers / char / i8k.c
index 776c50161432a9d027877631cdf6cd10bcd38e20..d915707d2ba1d3eae5b3ade411dd5226a5f3296d 100644 (file)
@@ -1,12 +1,11 @@
 /*
  * i8k.c -- Linux driver for accessing the SMM BIOS on Dell laptops.
- *         See http://www.debian.org/~dz/i8k/ for more information
- *         and for latest version of this driver.
  *
  * Copyright (C) 2001  Massimo Dal Zotto <dz@debian.org>
  *
  * Hwmon integration:
  * Copyright (C) 2011  Jean Delvare <jdelvare@suse.de>
+ * Copyright (C) 2013  Guenter Roeck <linux@roeck-us.net>
  *
  * 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
@@ -19,6 +18,8 @@
  * General Public License for more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
+#include <linux/sched.h>
 
 #include <linux/i8k.h>
 
-#define I8K_VERSION            "1.14 21/02/2005"
-
 #define I8K_SMM_FN_STATUS      0x0025
 #define I8K_SMM_POWER_STATUS   0x0069
 #define I8K_SMM_SET_FAN                0x01a3
@@ -44,7 +44,6 @@
 #define I8K_SMM_GET_TEMP       0x10a3
 #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_MAX_TEMP           127
 static DEFINE_MUTEX(i8k_mutex);
 static char bios_version[4];
 static struct device *i8k_hwmon_dev;
+static u32 i8k_hwmon_flags;
+static int i8k_fan_mult;
+
+#define I8K_HWMON_HAVE_TEMP1   (1 << 0)
+#define I8K_HWMON_HAVE_TEMP2   (1 << 1)
+#define I8K_HWMON_HAVE_TEMP3   (1 << 2)
+#define I8K_HWMON_HAVE_TEMP4   (1 << 3)
+#define I8K_HWMON_HAVE_FAN1    (1 << 4)
+#define I8K_HWMON_HAVE_FAN2    (1 << 5)
 
 MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");
 MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops");
@@ -103,11 +111,11 @@ static const struct file_operations i8k_fops = {
 
 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));
+       unsigned int ebx __packed;
+       unsigned int ecx __packed;
+       unsigned int edx __packed;
+       unsigned int esi __packed;
+       unsigned int edi __packed;
 };
 
 static inline const char *i8k_get_dmi_data(int field)
@@ -124,6 +132,17 @@ static int i8k_smm(struct smm_regs *regs)
 {
        int rc;
        int eax = regs->eax;
+       cpumask_var_t old_mask;
+
+       /* SMM requires CPU 0 */
+       if (!alloc_cpumask_var(&old_mask, GFP_KERNEL))
+               return -ENOMEM;
+       cpumask_copy(old_mask, &current->cpus_allowed);
+       set_cpus_allowed_ptr(current, cpumask_of(0));
+       if (smp_processor_id() != 0) {
+               rc = -EBUSY;
+               goto out;
+       }
 
 #if defined(CONFIG_X86_64)
        asm volatile("pushq %%rax\n\t"
@@ -148,7 +167,7 @@ static int i8k_smm(struct smm_regs *regs)
                "pushfq\n\t"
                "popq %%rax\n\t"
                "andl $1,%%eax\n"
-               :"=a"(rc)
+               : "=a"(rc)
                :    "a"(regs)
                :    "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
 #else
@@ -174,25 +193,17 @@ static int i8k_smm(struct smm_regs *regs)
            "lahf\n\t"
            "shrl $8,%%eax\n\t"
            "andl $1,%%eax\n"
-           :"=a"(rc)
+           : "=a"(rc)
            :    "a"(regs)
            :    "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
 #endif
        if (rc != 0 || (regs->eax & 0xffff) == 0xffff || regs->eax == eax)
-               return -EINVAL;
+               rc = -EINVAL;
 
-       return 0;
-}
-
-/*
- * Read the bios version. Return the version as an integer corresponding
- * to the ascii value, for example "A17" is returned as 0x00413137.
- */
-static int i8k_get_bios_version(void)
-{
-       struct smm_regs regs = { .eax = I8K_SMM_BIOS_VERSION, };
-
-       return i8k_smm(&regs) ? : regs.eax;
+out:
+       set_cpus_allowed_ptr(current, old_mask);
+       free_cpumask_var(old_mask);
+       return rc;
 }
 
 /*
@@ -203,7 +214,8 @@ static int i8k_get_fn_status(void)
        struct smm_regs regs = { .eax = I8K_SMM_FN_STATUS, };
        int rc;
 
-       if ((rc = i8k_smm(&regs)) < 0)
+       rc = i8k_smm(&regs);
+       if (rc < 0)
                return rc;
 
        switch ((regs.eax >> I8K_FN_SHIFT) & I8K_FN_MASK) {
@@ -226,7 +238,8 @@ static int i8k_get_power_status(void)
        struct smm_regs regs = { .eax = I8K_SMM_POWER_STATUS, };
        int rc;
 
-       if ((rc = i8k_smm(&regs)) < 0)
+       rc = i8k_smm(&regs);
+       if (rc < 0)
                return rc;
 
        return (regs.eax & 0xff) == I8K_POWER_AC ? I8K_AC : I8K_BATTERY;
@@ -251,7 +264,7 @@ static int i8k_get_fan_speed(int fan)
        struct smm_regs regs = { .eax = I8K_SMM_GET_SPEED, };
 
        regs.ebx = fan & 0xff;
-       return i8k_smm(&regs) ? : (regs.eax & 0xffff) * fan_mult;
+       return i8k_smm(&regs) ? : (regs.eax & 0xffff) * i8k_fan_mult;
 }
 
 /*
@@ -277,10 +290,11 @@ static int i8k_get_temp(int sensor)
        int temp;
 
 #ifdef I8K_TEMPERATURE_BUG
-       static int prev;
+       static int prev[4];
 #endif
        regs.ebx = sensor & 0xff;
-       if ((rc = i8k_smm(&regs)) < 0)
+       rc = i8k_smm(&regs);
+       if (rc < 0)
                return rc;
 
        temp = regs.eax & 0xff;
@@ -294,10 +308,10 @@ static int i8k_get_temp(int sensor)
         # 1003655139 00000054 00005c52
         */
        if (temp > I8K_MAX_TEMP) {
-               temp = prev;
-               prev = I8K_MAX_TEMP;
+               temp = prev[sensor];
+               prev[sensor] = I8K_MAX_TEMP;
        } else {
-               prev = temp;
+               prev[sensor] = temp;
        }
 #endif
 
@@ -309,7 +323,8 @@ static int i8k_get_dell_signature(int req_fn)
        struct smm_regs regs = { .eax = req_fn, };
        int rc;
 
-       if ((rc = i8k_smm(&regs)) < 0)
+       rc = i8k_smm(&regs);
+       if (rc < 0)
                return rc;
 
        return regs.eax == 1145651527 && regs.edx == 1145392204 ? 0 : -1;
@@ -328,12 +343,14 @@ i8k_ioctl_unlocked(struct file *fp, unsigned int cmd, unsigned long arg)
 
        switch (cmd) {
        case I8K_BIOS_VERSION:
-               val = i8k_get_bios_version();
+               val = (bios_version[0] << 16) |
+                               (bios_version[1] << 8) | bios_version[2];
                break;
 
        case I8K_MACHINE_ID:
                memset(buff, 0, 16);
-               strlcpy(buff, i8k_get_dmi_data(DMI_PRODUCT_SERIAL), sizeof(buff));
+               strlcpy(buff, i8k_get_dmi_data(DMI_PRODUCT_SERIAL),
+                       sizeof(buff));
                break;
 
        case I8K_FN_STATUS:
@@ -470,12 +487,13 @@ static ssize_t i8k_hwmon_show_temp(struct device *dev,
                                   struct device_attribute *devattr,
                                   char *buf)
 {
-       int cpu_temp;
+       int index = to_sensor_dev_attr(devattr)->index;
+       int temp;
 
-       cpu_temp = i8k_get_temp(0);
-       if (cpu_temp < 0)
-               return cpu_temp;
-       return sprintf(buf, "%d\n", cpu_temp * 1000);
+       temp = i8k_get_temp(index);
+       if (temp < 0)
+               return temp;
+       return sprintf(buf, "%d\n", temp * 1000);
 }
 
 static ssize_t i8k_hwmon_show_fan(struct device *dev,
@@ -491,12 +509,44 @@ static ssize_t i8k_hwmon_show_fan(struct device *dev,
        return sprintf(buf, "%d\n", fan_speed);
 }
 
+static ssize_t i8k_hwmon_show_pwm(struct device *dev,
+                                 struct device_attribute *devattr,
+                                 char *buf)
+{
+       int index = to_sensor_dev_attr(devattr)->index;
+       int status;
+
+       status = i8k_get_fan_status(index);
+       if (status < 0)
+               return -EIO;
+       return sprintf(buf, "%d\n", clamp_val(status * 128, 0, 255));
+}
+
+static ssize_t i8k_hwmon_set_pwm(struct device *dev,
+                                struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+       int index = to_sensor_dev_attr(attr)->index;
+       unsigned long val;
+       int err;
+
+       err = kstrtoul(buf, 10, &val);
+       if (err)
+               return err;
+       val = clamp_val(DIV_ROUND_CLOSEST(val, 128), 0, 2);
+
+       mutex_lock(&i8k_mutex);
+       err = i8k_set_fan(index, val);
+       mutex_unlock(&i8k_mutex);
+
+       return err < 0 ? -EIO : count;
+}
+
 static ssize_t i8k_hwmon_show_label(struct device *dev,
                                    struct device_attribute *devattr,
                                    char *buf)
 {
-       static const char *labels[4] = {
-               "i8k",
+       static const char *labels[3] = {
                "CPU",
                "Left Fan",
                "Right Fan",
@@ -506,108 +556,108 @@ static ssize_t i8k_hwmon_show_label(struct device *dev,
        return sprintf(buf, "%s\n", labels[index]);
 }
 
-static DEVICE_ATTR(temp1_input, S_IRUGO, i8k_hwmon_show_temp, NULL);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, i8k_hwmon_show_temp, NULL, 3);
 static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, i8k_hwmon_show_fan, NULL,
                          I8K_FAN_LEFT);
+static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, i8k_hwmon_show_pwm,
+                         i8k_hwmon_set_pwm, 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 SENSOR_DEVICE_ATTR(pwm2, S_IRUGO | S_IWUSR, i8k_hwmon_show_pwm,
+                         i8k_hwmon_set_pwm, I8K_FAN_RIGHT);
+static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, i8k_hwmon_show_label, NULL, 0);
+static SENSOR_DEVICE_ATTR(fan1_label, S_IRUGO, i8k_hwmon_show_label, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan2_label, S_IRUGO, i8k_hwmon_show_label, NULL, 2);
+
+static struct attribute *i8k_attrs[] = {
+       &sensor_dev_attr_temp1_input.dev_attr.attr,     /* 0 */
+       &sensor_dev_attr_temp1_label.dev_attr.attr,     /* 1 */
+       &sensor_dev_attr_temp2_input.dev_attr.attr,     /* 2 */
+       &sensor_dev_attr_temp3_input.dev_attr.attr,     /* 3 */
+       &sensor_dev_attr_temp4_input.dev_attr.attr,     /* 4 */
+       &sensor_dev_attr_fan1_input.dev_attr.attr,      /* 5 */
+       &sensor_dev_attr_pwm1.dev_attr.attr,            /* 6 */
+       &sensor_dev_attr_fan1_label.dev_attr.attr,      /* 7 */
+       &sensor_dev_attr_fan2_input.dev_attr.attr,      /* 8 */
+       &sensor_dev_attr_pwm2.dev_attr.attr,            /* 9 */
+       &sensor_dev_attr_fan2_label.dev_attr.attr,      /* 10 */
+       NULL
+};
 
-static void i8k_hwmon_remove_files(struct device *dev)
+static umode_t i8k_is_visible(struct kobject *kobj, struct attribute *attr,
+                             int index)
 {
-       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);
+       if ((index == 0 || index == 1) &&
+           !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP1))
+               return 0;
+       if (index == 2 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP2))
+               return 0;
+       if (index == 3 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP3))
+               return 0;
+       if (index == 4 && !(i8k_hwmon_flags & I8K_HWMON_HAVE_TEMP4))
+               return 0;
+       if (index >= 5 && index <= 7 &&
+           !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN1))
+               return 0;
+       if (index >= 8 && index <= 10 &&
+           !(i8k_hwmon_flags & I8K_HWMON_HAVE_FAN2))
+               return 0;
+
+       return attr->mode;
 }
 
+static const struct attribute_group i8k_group = {
+       .attrs = i8k_attrs,
+       .is_visible = i8k_is_visible,
+};
+__ATTRIBUTE_GROUPS(i8k);
+
 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;
+       i8k_hwmon_flags = 0;
 
        /* 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;
-       }
+       if (err >= 0)
+               i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP1;
+       /* check for additional temperature sensors */
+       err = i8k_get_temp(1);
+       if (err >= 0)
+               i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP2;
+       err = i8k_get_temp(2);
+       if (err >= 0)
+               i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP3;
+       err = i8k_get_temp(3);
+       if (err >= 0)
+               i8k_hwmon_flags |= I8K_HWMON_HAVE_TEMP4;
 
        /* 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;
-       }
+       if (err >= 0)
+               i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN1;
 
        /* 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;
-       }
+       if (err >= 0)
+               i8k_hwmon_flags |= I8K_HWMON_HAVE_FAN2;
 
+       i8k_hwmon_dev = hwmon_device_register_with_groups(NULL, "i8k", NULL,
+                                                         i8k_groups);
+       if (IS_ERR(i8k_hwmon_dev)) {
+               err = PTR_ERR(i8k_hwmon_dev);
+               i8k_hwmon_dev = NULL;
+               pr_err("hwmon registration failed (%d)\n", err);
+               return err;
+       }
        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[] = {
+static struct dmi_system_id i8k_dmi_table[] __initdata = {
        {
                .ident = "Dell Inspiron",
                .matches = {
@@ -671,7 +721,23 @@ static struct dmi_system_id __initdata i8k_dmi_table[] = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "XPS L421X"),
                },
        },
-        { }
+       {
+               .ident = "Dell Studio",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Studio"),
+               },
+               .driver_data = (void *)1,       /* fan multiplier override */
+       },
+       {
+               .ident = "Dell XPS M140",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "MXC051"),
+               },
+               .driver_data = (void *)1,       /* fan multiplier override */
+       },
+       { }
 };
 
 /*
@@ -679,8 +745,7 @@ static struct dmi_system_id __initdata i8k_dmi_table[] = {
  */
 static int __init i8k_probe(void)
 {
-       char buff[4];
-       int version;
+       const struct dmi_system_id *id;
 
        /*
         * Get DMI information
@@ -689,49 +754,30 @@ static int __init i8k_probe(void)
                if (!ignore_dmi && !force)
                        return -ENODEV;
 
-               printk(KERN_INFO "i8k: not running on a supported Dell system.\n");
-               printk(KERN_INFO "i8k: vendor=%s, model=%s, version=%s\n",
+               pr_info("not running on a supported Dell system.\n");
+               pr_info("vendor=%s, model=%s, version=%s\n",
                        i8k_get_dmi_data(DMI_SYS_VENDOR),
                        i8k_get_dmi_data(DMI_PRODUCT_NAME),
                        i8k_get_dmi_data(DMI_BIOS_VERSION));
        }
 
-       strlcpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION), sizeof(bios_version));
+       strlcpy(bios_version, i8k_get_dmi_data(DMI_BIOS_VERSION),
+               sizeof(bios_version));
 
        /*
         * Get SMM Dell signature
         */
        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");
+               pr_err("unable to get SMM Dell signature\n");
                if (!force)
                        return -ENODEV;
        }
 
-       /*
-        * Get SMM BIOS version.
-        */
-       version = i8k_get_bios_version();
-       if (version <= 0) {
-               printk(KERN_WARNING "i8k: unable to get SMM BIOS version\n");
-       } else {
-               buff[0] = (version >> 16) & 0xff;
-               buff[1] = (version >> 8) & 0xff;
-               buff[2] = (version) & 0xff;
-               buff[3] = '\0';
-               /*
-                * If DMI BIOS version is unknown use SMM BIOS version.
-                */
-               if (!dmi_get_system_info(DMI_BIOS_VERSION))
-                       strlcpy(bios_version, buff, sizeof(bios_version));
-
-               /*
-                * Check if the two versions match.
-                */
-               if (strncmp(buff, bios_version, sizeof(bios_version)) != 0)
-                       printk(KERN_WARNING "i8k: BIOS version mismatch: %s != %s\n",
-                               buff, bios_version);
-       }
+       i8k_fan_mult = fan_mult;
+       id = dmi_first_match(i8k_dmi_table);
+       if (id && fan_mult == I8K_FAN_MULT && id->driver_data)
+               i8k_fan_mult = (unsigned long)id->driver_data;
 
        return 0;
 }
@@ -754,10 +800,6 @@ static int __init i8k_init(void)
        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;
 
  exit_remove_proc:
@@ -767,7 +809,7 @@ static int __init i8k_init(void)
 
 static void __exit i8k_exit(void)
 {
-       i8k_exit_hwmon();
+       hwmon_device_unregister(i8k_hwmon_dev);
        remove_proc_entry("i8k", NULL);
 }