Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
  hwmon: fscher read control bugfix
  hwmon: (adm1031) Fix broken links in documentation
  hwmon: make abituguru3_read_increment_offset() static
  hwmon: Fix regression caused by typo in lm90.c
  hwmon: (applesmc) add temperature sensors set for Macbook
  hwmon: fscher control update bugfix
  hwmon: fix dme1737 temp fault attribute
  hwmon: Add missing __devexit tags in various drivers
  hwmon: clean up duplicate includes
  hwmon: fix lm78 detection regression
  hwmon: fix array overruns in lm93.c
  hwmon: add support for THMC50 and ADM1022

18 files changed, 478 insertions, 21 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index dbdca6f10e46..192953b29b28 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -520,6 +520,16 @@ config SENSORS_SMSC47B397
           This driver can also be built as a module.  If so, the module
           will be called smsc47b397.
 
+config SENSORS_THMC50
+        tristate "Texas Instruments THMC50 / Analog Devices ADM1022"
+        depends on I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for Texas Instruments THMC50
+          sensor chips and clones: the Analog Devices ADM1022.
+
+          This driver can also be built as a module.  If so, the module
+          will be called thmc50.
+
 config SENSORS_VIA686A
         tristate "VIA686A"
         depends on PCI
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 59f81fae40a0..d04f90031ebf 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -56,6 +56,7 @@ obj-$(CONFIG_SENSORS_SIS5595)	+= sis5595.o
 obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
 obj-$(CONFIG_SENSORS_SMSC47M1)  += smsc47m1.o
 obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
+obj-$(CONFIG_SENSORS_THMC50)    += thmc50.o
 obj-$(CONFIG_SENSORS_VIA686A)   += via686a.o
 obj-$(CONFIG_SENSORS_VT1211)    += vt1211.o
 obj-$(CONFIG_SENSORS_VT8231)    += vt8231.o
diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c
index a003d104ca45..cdd8b6dea16d 100644
--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
@@ -691,8 +691,9 @@ static int abituguru3_read(struct abituguru3_data *data, u8 bank, u8 offset,
 
 /* Sensor settings are stored 1 byte per offset with the bytes
    placed add consecutive offsets. */
-int abituguru3_read_increment_offset(struct abituguru3_data *data, u8 bank,
-        u8 offset, u8 count, u8 *buf, int offset_count)
+static int abituguru3_read_increment_offset(struct abituguru3_data *data,
+                                            u8 bank, u8 offset, u8 count,
+                                            u8 *buf, int offset_count)
 {
         int i, x;
 
diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/hwmon/ams/ams-core.c
index 6db973739725..a112a03e8f29 100644
--- a/drivers/hwmon/ams/ams-core.c
+++ b/drivers/hwmon/ams/ams-core.c
@@ -23,7 +23,6 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/module.h>
 #include <asm/pmac_pfunc.h>
 #include <asm/of_platform.h>
 
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index fd1281f42209..941729a131f5 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -79,11 +79,15 @@
 
 /*
  * Temperature sensors keys (sp78 - 2 bytes).
- * First set for Macbook(Pro), second for Macmini.
  */
 static const char* temperature_sensors_sets[][13] = {
+/* Set 0: Macbook Pro */
         { "TA0P", "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "Th0H",
           "Th1H", "Tm0P", "Ts0P", "Ts1P", NULL },
+/* Set 1: Macbook set */
+        { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "Th0H", "Th0S",
+          "Th1H", "Ts0P", NULL },
+/* Set 2: Macmini set */
         { "TC0D", "TC0P", NULL }
 };
 
@@ -1150,10 +1154,10 @@ static void applesmc_release_accelerometer(void)
 static __initdata struct dmi_match_data applesmc_dmi_data[] = {
 /* MacBook Pro: accelerometer, backlight and temperature set 0 */
         { .accelerometer = 1, .light = 1, .temperature_set = 0 },
-/* MacBook: accelerometer and temperature set 0 */
-        { .accelerometer = 1, .light = 0, .temperature_set = 0 },
-/* MacBook: temperature set 1 */
-        { .accelerometer = 0, .light = 0, .temperature_set = 1 }
+/* MacBook: accelerometer and temperature set 1 */
+        { .accelerometer = 1, .light = 0, .temperature_set = 1 },
+/* MacMini: temperature set 2 */
+        { .accelerometer = 0, .light = 0, .temperature_set = 2 },
 };
 
 /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index be3aaa5d0b91..e9cbc727664d 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -750,7 +750,7 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
                 res = (data->alarms >> DME1737_BIT_ALARM_TEMP[ix]) & 0x01;
                 break;
         case SYS_TEMP_FAULT:
-                res = (data->temp[ix] == 0x0800);
+                res = (((u16)data->temp[ix] & 0xff00) == 0x8000);
                 break;
         default:
                 res = 0;
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index 19717752cfca..b34b546c68b8 100644
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -441,6 +441,8 @@ static struct fscher_data *fscher_update_device(struct device *dev)
                 data->watchdog[2] = fscher_read_value(client, FSCHER_REG_WDOG_CONTROL);
 
                 data->global_event = fscher_read_value(client, FSCHER_REG_EVENT_STATE);
+                data->global_control = fscher_read_value(client,
+                                                        FSCHER_REG_CONTROL);
 
                 data->last_updated = jiffies;
                 data->valid = 1;                 
@@ -599,7 +601,7 @@ static ssize_t set_control(struct i2c_client *client, struct fscher_data *data,
         unsigned long v = simple_strtoul(buf, NULL, 10) & 0x01;
 
         mutex_lock(&data->update_lock);
-        data->global_control &= ~v;
+        data->global_control = v;
         fscher_write_value(client, reg, v);
         mutex_unlock(&data->update_lock);
         return count;
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index eff6036e15c0..d75dba9b810b 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -252,7 +252,7 @@ struct it87_data {
 
 
 static int it87_probe(struct platform_device *pdev);
-static int it87_remove(struct platform_device *pdev);
+static int __devexit it87_remove(struct platform_device *pdev);
 
 static int it87_read_value(struct it87_data *data, u8 reg);
 static void it87_write_value(struct it87_data *data, u8 reg, u8 value);
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 9fb572f03ba5..565c4e679b8d 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -864,7 +864,7 @@ static int __init lm78_isa_found(unsigned short address)
         /* Determine the chip type */
         outb_p(LM78_REG_CHIPID, address + LM78_ADDR_REG_OFFSET);
         val = inb_p(address + LM78_DATA_REG_OFFSET);
-        if (val == 0x00                 /* LM78 */
+        if (val == 0x00 || val == 0x20  /* LM78 */
          || val == 0x40                 /* LM78-J */
          || (val & 0xfe) == 0xc0)       /* LM79 */
                 found = 1;
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index 48833fff4920..af541d67245d 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -585,7 +585,7 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
                          * those of the man_id register.
                          */
                         if (chip_id == man_id
-                         && (address == 0x4F || address == 0x4D)
+                         && (address == 0x4C || address == 0x4D)
                          && (reg_config1 & 0x1F) == (man_id & 0x0F)
                          && reg_convrate <= 0x09) {
                                 kind = max6657;
diff --git a/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c
index 23edf4fe4221..d84f8bf6f284 100644
--- a/drivers/hwmon/lm93.c
+++ b/drivers/hwmon/lm93.c
@@ -234,7 +234,7 @@ struct lm93_data {
         struct {
                 u8 min;
                 u8 max;
-        } temp_lim[3];
+        } temp_lim[4];
 
         /* vin1 - vin16: low and high limits */
         struct {
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index cb72526c346a..f57c75d59a5b 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -220,7 +220,7 @@ struct pc87360_data {
  */
 
 static int pc87360_probe(struct platform_device *pdev);
-static int pc87360_remove(struct platform_device *pdev);
+static int __devexit pc87360_remove(struct platform_device *pdev);
 
 static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,
                               u8 reg);
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 83321b28cf0e..92956eb3f3c1 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -187,7 +187,7 @@ struct sis5595_data {
 static struct pci_dev *s_bridge;        /* pointer to the (only) sis5595 */
 
 static int sis5595_probe(struct platform_device *pdev);
-static int sis5595_remove(struct platform_device *pdev);
+static int __devexit sis5595_remove(struct platform_device *pdev);
 
 static int sis5595_read_value(struct sis5595_data *data, u8 reg);
 static void sis5595_write_value(struct sis5595_data *data, u8 reg, u8 value);
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 1de2f2be8708..338ee4f54614 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -134,7 +134,7 @@ struct smsc47m1_sio_data {
 
 
 static int smsc47m1_probe(struct platform_device *pdev);
-static int smsc47m1_remove(struct platform_device *pdev);
+static int __devexit smsc47m1_remove(struct platform_device *pdev);
 static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
                 int init);
 
diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c
new file mode 100644
index 000000000000..9395b52d9b99
--- /dev/null
+++ b/drivers/hwmon/thmc50.c
@@ -0,0 +1,440 @@
+/*
+    thmc50.c - Part of lm_sensors, Linux kernel modules for hardware
+             monitoring
+    Copyright (C) 2007 Krzysztof Helt <krzysztof.h1@wp.pl>
+    Based on 2.4 driver by Frodo Looijaard <frodol@dds.nl> and
+    Philip Edelbrock <phil@netroedge.com>
+
+    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 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+
+MODULE_LICENSE("GPL");
+
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
+
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_2(thmc50, adm1022);
+I2C_CLIENT_MODULE_PARM(adm1022_temp3, "List of adapter,address pairs "
+                        "to enable 3rd temperature (ADM1022 only)");
+
+/* Many THMC50 constants specified below */
+
+/* The THMC50 registers */
+#define THMC50_REG_CONF                         0x40
+#define THMC50_REG_COMPANY_ID                   0x3E
+#define THMC50_REG_DIE_CODE                     0x3F
+#define THMC50_REG_ANALOG_OUT                   0x19
+
+const static u8 THMC50_REG_TEMP[] = { 0x27, 0x26, 0x20 };
+const static u8 THMC50_REG_TEMP_MIN[] = { 0x3A, 0x38, 0x2C };
+const static u8 THMC50_REG_TEMP_MAX[] = { 0x39, 0x37, 0x2B };
+
+#define THMC50_REG_CONF_nFANOFF                 0x20
+
+/* Each client has this additional data */
+struct thmc50_data {
+        struct i2c_client client;
+        struct class_device *class_dev;
+
+        struct mutex update_lock;
+        enum chips type;
+        unsigned long last_updated;     /* In jiffies */
+        char has_temp3;         /* !=0 if it is ADM1022 in temp3 mode */
+        char valid;             /* !=0 if following fields are valid */
+
+        /* Register values */
+        s8 temp_input[3];
+        s8 temp_max[3];
+        s8 temp_min[3];
+        u8 analog_out;
+};
+
+static int thmc50_attach_adapter(struct i2c_adapter *adapter);
+static int thmc50_detach_client(struct i2c_client *client);
+static void thmc50_init_client(struct i2c_client *client);
+static struct thmc50_data *thmc50_update_device(struct device *dev);
+
+static struct i2c_driver thmc50_driver = {
+        .driver = {
+                .name = "thmc50",
+        },
+        .attach_adapter = thmc50_attach_adapter,
+        .detach_client = thmc50_detach_client,
+};
+
+static ssize_t show_analog_out(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+        struct thmc50_data *data = thmc50_update_device(dev);
+        return sprintf(buf, "%d\n", data->analog_out);
+}
+
+static ssize_t set_analog_out(struct device *dev,
+                              struct device_attribute *attr,
+                              const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct thmc50_data *data = i2c_get_clientdata(client);
+        int tmp = simple_strtoul(buf, NULL, 10);
+        int config;
+
+        mutex_lock(&data->update_lock);
+        data->analog_out = SENSORS_LIMIT(tmp, 0, 255);
+        i2c_smbus_write_byte_data(client, THMC50_REG_ANALOG_OUT,
+                                  data->analog_out);
+
+        config = i2c_smbus_read_byte_data(client, THMC50_REG_CONF);
+        if (data->analog_out == 0)
+                config &= ~THMC50_REG_CONF_nFANOFF;
+        else
+                config |= THMC50_REG_CONF_nFANOFF;
+        i2c_smbus_write_byte_data(client, THMC50_REG_CONF, config);
+
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+/* There is only one PWM mode = DC */
+static ssize_t show_pwm_mode(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        return sprintf(buf, "0\n");
+}
+
+/* Temperatures */
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        int nr = to_sensor_dev_attr(attr)->index;
+        struct thmc50_data *data = thmc50_update_device(dev);
+        return sprintf(buf, "%d\n", data->temp_input[nr] * 1000);
+}
+
+static ssize_t show_temp_min(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        int nr = to_sensor_dev_attr(attr)->index;
+        struct thmc50_data *data = thmc50_update_device(dev);
+        return sprintf(buf, "%d\n", data->temp_min[nr] * 1000);
+}
+
+static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr,
+                            const char *buf, size_t count)
+{
+        int nr = to_sensor_dev_attr(attr)->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct thmc50_data *data = i2c_get_clientdata(client);
+        int val = simple_strtol(buf, NULL, 10);
+
+        mutex_lock(&data->update_lock);
+        data->temp_min[nr] = SENSORS_LIMIT(val / 1000, -128, 127);
+        i2c_smbus_write_byte_data(client, THMC50_REG_TEMP_MIN[nr],
+                                  data->temp_min[nr]);
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+static ssize_t show_temp_max(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        int nr = to_sensor_dev_attr(attr)->index;
+        struct thmc50_data *data = thmc50_update_device(dev);
+        return sprintf(buf, "%d\n", data->temp_max[nr] * 1000);
+}
+
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr,
+                            const char *buf, size_t count)
+{
+        int nr = to_sensor_dev_attr(attr)->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct thmc50_data *data = i2c_get_clientdata(client);
+        int val = simple_strtol(buf, NULL, 10);
+
+        mutex_lock(&data->update_lock);
+        data->temp_max[nr] = SENSORS_LIMIT(val / 1000, -128, 127);
+        i2c_smbus_write_byte_data(client, THMC50_REG_TEMP_MAX[nr],
+                                  data->temp_max[nr]);
+        mutex_unlock(&data->update_lock);
+        return count;
+}
+
+#define temp_reg(offset)                                                \
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp,     \
+                        NULL, offset - 1);                              \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IRUGO | S_IWUSR,        \
+                        show_temp_min, set_temp_min, offset - 1);       \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,        \
+                        show_temp_max, set_temp_max, offset - 1);
+
+temp_reg(1);
+temp_reg(2);
+temp_reg(3);
+
+static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, show_analog_out,
+                          set_analog_out, 0);
+static SENSOR_DEVICE_ATTR(pwm1_mode, S_IRUGO, show_pwm_mode, NULL, 0);
+
+static struct attribute *thmc50_attributes[] = {
+        &sensor_dev_attr_temp1_max.dev_attr.attr,
+        &sensor_dev_attr_temp1_min.dev_attr.attr,
+        &sensor_dev_attr_temp1_input.dev_attr.attr,
+        &sensor_dev_attr_temp2_max.dev_attr.attr,
+        &sensor_dev_attr_temp2_min.dev_attr.attr,
+        &sensor_dev_attr_temp2_input.dev_attr.attr,
+        &sensor_dev_attr_pwm1.dev_attr.attr,
+        &sensor_dev_attr_pwm1_mode.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group thmc50_group = {
+        .attrs = thmc50_attributes,
+};
+
+/* for ADM1022 3rd temperature mode */
+static struct attribute *adm1022_attributes[] = {
+        &sensor_dev_attr_temp3_max.dev_attr.attr,
+        &sensor_dev_attr_temp3_min.dev_attr.attr,
+        &sensor_dev_attr_temp3_input.dev_attr.attr,
+        NULL
+};
+
+static const struct attribute_group adm1022_group = {
+        .attrs = adm1022_attributes,
+};
+
+static int thmc50_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        unsigned company;
+        unsigned revision;
+        unsigned config;
+        struct i2c_client *client;
+        struct thmc50_data *data;
+        struct device *dev;
+        int err = 0;
+        const char *type_name = "";
+
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+                pr_debug("thmc50: detect failed, "
+                         "smbus byte data not supported!\n");
+                goto exit;
+        }
+
+        /* OK. For now, we presume we have a valid client. We now create the
+           client structure, even though we cannot fill it completely yet.
+           But it allows us to access thmc50 registers. */
+        if (!(data = kzalloc(sizeof(struct thmc50_data), GFP_KERNEL))) {
+                pr_debug("thmc50: detect failed, kzalloc failed!\n");
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        client = &data->client;
+        i2c_set_clientdata(client, data);
+        client->addr = address;
+        client->adapter = adapter;
+        client->driver = &thmc50_driver;
+        dev = &client->dev;
+
+        pr_debug("thmc50: Probing for THMC50 at 0x%2X on bus %d\n",
+                 client->addr, i2c_adapter_id(client->adapter));
+
+        /* Now, we do the remaining detection. */
+        company = i2c_smbus_read_byte_data(client, THMC50_REG_COMPANY_ID);
+        revision = i2c_smbus_read_byte_data(client, THMC50_REG_DIE_CODE);
+        config = i2c_smbus_read_byte_data(client, THMC50_REG_CONF);
+
+        if (kind == 0)
+                kind = thmc50;
+        else if (kind < 0) {
+                err = -ENODEV;
+                if (revision >= 0xc0 && ((config & 0x10) == 0)) {
+                        if (company == 0x49) {
+                                kind = thmc50;
+                                err = 0;
+                        } else if (company == 0x41) {
+                                kind = adm1022;
+                                err = 0;
+                        }
+                }
+        }
+        if (err == -ENODEV) {
+                pr_debug("thmc50: Detection of THMC50/ADM1022 failed\n");
+                goto exit_free;
+        }
+        pr_debug("thmc50: Detected %s (version %x, revision %x)\n",
+                 type_name, (revision >> 4) - 0xc, revision & 0xf);
+        data->type = kind;
+
+        if (kind == thmc50)
+                type_name = "thmc50";
+        else if (kind == adm1022) {
+                int id = i2c_adapter_id(client->adapter);
+                int i;
+
+                type_name = "adm1022";
+                data->has_temp3 = (config >> 7) & 1;    /* config MSB */
+                for (i = 0; i + 1 < adm1022_temp3_num; i += 2)
+                        if (adm1022_temp3[i] == id &&
+                            adm1022_temp3[i + 1] == address) {
+                                /* enable 2nd remote temp */
+                                data->has_temp3 = 1;
+                                break;
+                        }
+        }
+
+        /* Fill in the remaining client fields & put it into the global list */
+        strlcpy(client->name, type_name, I2C_NAME_SIZE);
+        mutex_init(&data->update_lock);
+
+        /* Tell the I2C layer a new client has arrived */
+        if ((err = i2c_attach_client(client)))
+                goto exit_free;
+
+        thmc50_init_client(client);
+
+        /* Register sysfs hooks */
+        if ((err = sysfs_create_group(&client->dev.kobj, &thmc50_group)))
+                goto exit_detach;
+
+        /* Register ADM1022 sysfs hooks */
+        if (data->type == adm1022)
+                if ((err = sysfs_create_group(&client->dev.kobj,
+                                              &adm1022_group)))
+                        goto exit_remove_sysfs_thmc50;
+
+        /* Register a new directory entry with module sensors */
+        data->class_dev = hwmon_device_register(&client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_remove_sysfs;
+        }
+
+        return 0;
+
+exit_remove_sysfs:
+        if (data->type == adm1022)
+                sysfs_remove_group(&client->dev.kobj, &adm1022_group);
+exit_remove_sysfs_thmc50:
+        sysfs_remove_group(&client->dev.kobj, &thmc50_group);
+exit_detach:
+        i2c_detach_client(client);
+exit_free:
+        kfree(data);
+exit:
+        return err;
+}
+
+static int thmc50_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_probe(adapter, &addr_data, thmc50_detect);
+}
+
+static int thmc50_detach_client(struct i2c_client *client)
+{
+        struct thmc50_data *data = i2c_get_clientdata(client);
+        int err;
+
+        hwmon_device_unregister(data->class_dev);
+        sysfs_remove_group(&client->dev.kobj, &thmc50_group);
+        if (data->type == adm1022)
+                sysfs_remove_group(&client->dev.kobj, &adm1022_group);
+
+        if ((err = i2c_detach_client(client)))
+                return err;
+
+        kfree(data);
+
+        return 0;
+}
+
+static void thmc50_init_client(struct i2c_client *client)
+{
+        struct thmc50_data *data = i2c_get_clientdata(client);
+        int config;
+
+        data->analog_out = i2c_smbus_read_byte_data(client,
+                                                    THMC50_REG_ANALOG_OUT);
+        /* set up to at least 1 */
+        if (data->analog_out == 0) {
+                data->analog_out = 1;
+                i2c_smbus_write_byte_data(client, THMC50_REG_ANALOG_OUT,
+                                          data->analog_out);
+        }
+        config = i2c_smbus_read_byte_data(client, THMC50_REG_CONF);
+        config |= 0x1;  /* start the chip if it is in standby mode */
+        if (data->has_temp3)
+                config |= 0x80;         /* enable 2nd remote temp */
+        i2c_smbus_write_byte_data(client, THMC50_REG_CONF, config);
+}
+
+static struct thmc50_data *thmc50_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct thmc50_data *data = i2c_get_clientdata(client);
+        int timeout = HZ / 5 + (data->type == thmc50 ? HZ : 0);
+
+        mutex_lock(&data->update_lock);
+
+        if (time_after(jiffies, data->last_updated + timeout)
+            || !data->valid) {
+
+                int temps = data->has_temp3 ? 3 : 2;
+                int i;
+                for (i = 0; i < temps; i++) {
+                        data->temp_input[i] = i2c_smbus_read_byte_data(client,
+                                                THMC50_REG_TEMP[i]);
+                        data->temp_max[i] = i2c_smbus_read_byte_data(client,
+                                                THMC50_REG_TEMP_MAX[i]);
+                        data->temp_min[i] = i2c_smbus_read_byte_data(client,
+                                                THMC50_REG_TEMP_MIN[i]);
+                }
+                data->analog_out =
+                    i2c_smbus_read_byte_data(client, THMC50_REG_ANALOG_OUT);
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+
+        mutex_unlock(&data->update_lock);
+
+        return data;
+}
+
+static int __init sm_thmc50_init(void)
+{
+        return i2c_add_driver(&thmc50_driver);
+}
+
+static void __exit sm_thmc50_exit(void)
+{
+        i2c_del_driver(&thmc50_driver);
+}
+
+MODULE_AUTHOR("Krzysztof Helt <krzysztof.h1@wp.pl>");
+MODULE_DESCRIPTION("THMC50 driver");
+
+module_init(sm_thmc50_init);
+module_exit(sm_thmc50_exit);
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 24a6851491d0..696c8a2e5374 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -314,7 +314,7 @@ struct via686a_data {
 static struct pci_dev *s_bridge;        /* pointer to the (only) via686a */
 
 static int via686a_probe(struct platform_device *pdev);
-static int via686a_remove(struct platform_device *pdev);
+static int __devexit via686a_remove(struct platform_device *pdev);
 
 static inline int via686a_read_value(struct via686a_data *data, u8 reg)
 {
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c
index c604972f0186..3e63eaf19041 100644
--- a/drivers/hwmon/vt8231.c
+++ b/drivers/hwmon/vt8231.c
@@ -167,7 +167,7 @@ struct vt8231_data {
 
 static struct pci_dev *s_bridge;
 static int vt8231_probe(struct platform_device *pdev);
-static int vt8231_remove(struct platform_device *pdev);
+static int __devexit vt8231_remove(struct platform_device *pdev);
 static struct vt8231_data *vt8231_update_device(struct device *dev);
 static void vt8231_init_device(struct vt8231_data *data);
 
@@ -751,7 +751,7 @@ exit_release:
         return err;
 }
 
-static int vt8231_remove(struct platform_device *pdev)
+static int __devexit vt8231_remove(struct platform_device *pdev)
 {
         struct vt8231_data *data = platform_get_drvdata(pdev);
         int i;
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index 1ce78179b005..7a4a15f4bf8b 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -387,7 +387,7 @@ struct w83627hf_sio_data {
 
 
 static int w83627hf_probe(struct platform_device *pdev);
-static int w83627hf_remove(struct platform_device *pdev);
+static int __devexit w83627hf_remove(struct platform_device *pdev);
 
 static int w83627hf_read_value(struct w83627hf_data *data, u16 reg);
 static int w83627hf_write_value(struct w83627hf_data *data, u16 reg, u16 value);