Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

author: Linus Torvalds <torvalds@evo.osdl.org> 2005-09-06 03:31:02 -0400
committer: Linus Torvalds <torvalds@evo.osdl.org> 2005-09-06 03:31:02 -0400
commit: 8566cfc9fe0934f52ddedc12b083176116c13978 (patch)
tree: b0f92fd0982a4dabaa2c108f4f1d130d2cff6798 /drivers
parent: 7bdb2b6aca356c765bb697a4e9e7599357ee1542 (diff)
parent: 77ae84554cc0178e03862391599a0cedf96fa4c4 (diff)
129 files changed, 3771 insertions, 2081 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 140d5f851a5b..138dc50270e3 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -12,12 +12,20 @@ config HWMON
          of a system. Most modern motherboards include such a device. It
          can include temperature sensors, voltage sensors, fan speed
          sensors and various additional features such as the ability to
-          control the speed of the fans.
+          control the speed of the fans.  If you want this support you
+          should say Y here and also to the specific driver(s) for your
+          sensors chip(s) below.
+          This support can also be built as a module.  If so, the module
+          will be called hwmon.
+config HWMON_VID
+        tristate
+        default n
 config SENSORS_ADM1021
        tristate "Analog Devices ADM1021 and compatibles"
        depends on HWMON && I2C
-        select I2C_SENSOR
        help
          If you say yes here you get support for Analog Devices ADM1021
          and ADM1023 sensor chips and clones: Maxim MAX1617 and MAX1617A,
@@ -30,7 +38,7 @@ config SENSORS_ADM1021
 config SENSORS_ADM1025
        tristate "Analog Devices ADM1025 and compatibles"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
        help
          If you say yes here you get support for Analog Devices ADM1025
          and Philips NE1619 sensor chips.
@@ -41,7 +49,7 @@ config SENSORS_ADM1025
 config SENSORS_ADM1026
        tristate "Analog Devices ADM1026 and compatibles"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
        help
          If you say yes here you get support for Analog Devices ADM1026
          sensor chip.
@@ -52,7 +60,6 @@ config SENSORS_ADM1026
 config SENSORS_ADM1031
        tristate "Analog Devices ADM1031 and compatibles"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for Analog Devices ADM1031
          and ADM1030 sensor chips.
@@ -63,7 +70,7 @@ config SENSORS_ADM1031
 config SENSORS_ADM9240
        tristate "Analog Devices ADM9240 and compatibles"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
        help
          If you say yes here you get support for Analog Devices ADM9240,
          Dallas DS1780, National Semiconductor LM81 sensor chips.
@@ -74,7 +81,7 @@ config SENSORS_ADM9240
 config SENSORS_ASB100
        tristate "Asus ASB100 Bach"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
        help
          If you say yes here you get support for the ASB100 Bach sensor
          chip found on some Asus mainboards.
@@ -85,7 +92,7 @@ config SENSORS_ASB100
 config SENSORS_ATXP1
        tristate "Attansic ATXP1 VID controller"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
        help
          If you say yes here you get support for the Attansic ATXP1 VID
          controller.
@@ -99,7 +106,6 @@ config SENSORS_ATXP1
 config SENSORS_DS1621
        tristate "Dallas Semiconductor DS1621 and DS1625"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for Dallas Semiconductor
          DS1621 and DS1625 sensor chips.
@@ -110,7 +116,6 @@ config SENSORS_DS1621
 config SENSORS_FSCHER
        tristate "FSC Hermes"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for Fujitsu Siemens
          Computers Hermes sensor chips.
@@ -121,7 +126,6 @@ config SENSORS_FSCHER
 config SENSORS_FSCPOS
        tristate "FSC Poseidon"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for Fujitsu Siemens
          Computers Poseidon sensor chips.
@@ -132,7 +136,6 @@ config SENSORS_FSCPOS
 config SENSORS_GL518SM
        tristate "Genesys Logic GL518SM"
        depends on HWMON && I2C
-        select I2C_SENSOR
        help
          If you say yes here you get support for Genesys Logic GL518SM
          sensor chips.
@@ -143,7 +146,7 @@ config SENSORS_GL518SM
 config SENSORS_GL520SM
        tristate "Genesys Logic GL520SM"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
        help
          If you say yes here you get support for Genesys Logic GL520SM
          sensor chips.
@@ -154,7 +157,8 @@ config SENSORS_GL520SM
 config SENSORS_IT87
        tristate "ITE IT87xx and compatibles"
        depends on HWMON && I2C
-        select I2C_SENSOR
+        select I2C_ISA
+        select HWMON_VID
        help
          If you say yes here you get support for ITE IT87xx sensor chips
          and clones: SiS960.
@@ -165,7 +169,6 @@ config SENSORS_IT87
 config SENSORS_LM63
        tristate "National Semiconductor LM63"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for the National Semiconductor
          LM63 remote diode digital temperature sensor with integrated fan
@@ -178,7 +181,6 @@ config SENSORS_LM63
 config SENSORS_LM75
        tristate "National Semiconductor LM75 and compatibles"
        depends on HWMON && I2C
-        select I2C_SENSOR
        help
          If you say yes here you get support for National Semiconductor LM75
          sensor chips and clones: Dallas Semiconductor DS75 and DS1775 (in
@@ -194,7 +196,6 @@ config SENSORS_LM75
 config SENSORS_LM77
        tristate "National Semiconductor LM77"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for National Semiconductor LM77
          sensor chips.
@@ -205,7 +206,8 @@ config SENSORS_LM77
 config SENSORS_LM78
        tristate "National Semiconductor LM78 and compatibles"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select I2C_ISA
+        select HWMON_VID
        help
          If you say yes here you get support for National Semiconductor LM78,
          LM78-J and LM79.
@@ -216,7 +218,6 @@ config SENSORS_LM78
 config SENSORS_LM80
        tristate "National Semiconductor LM80"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for National Semiconductor
          LM80 sensor chips.
@@ -227,7 +228,6 @@ config SENSORS_LM80
 config SENSORS_LM83
        tristate "National Semiconductor LM83"
        depends on HWMON && I2C
-        select I2C_SENSOR
        help
          If you say yes here you get support for National Semiconductor
          LM83 sensor chips.
@@ -238,7 +238,7 @@ config SENSORS_LM83
 config SENSORS_LM85
        tristate "National Semiconductor LM85 and compatibles"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
        help
          If you say yes here you get support for National Semiconductor LM85
          sensor chips and clones: ADT7463, EMC6D100, EMC6D102 and ADM1027.
@@ -249,7 +249,7 @@ config SENSORS_LM85
 config SENSORS_LM87
        tristate "National Semiconductor LM87"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
+        select HWMON_VID
        help
          If you say yes here you get support for National Semiconductor LM87
          sensor chips.
@@ -260,7 +260,6 @@ config SENSORS_LM87
 config SENSORS_LM90
        tristate "National Semiconductor LM90 and compatibles"
        depends on HWMON && I2C
-        select I2C_SENSOR
        help
          If you say yes here you get support for National Semiconductor LM90,
          LM86, LM89 and LM99, Analog Devices ADM1032 and Maxim MAX6657 and
@@ -275,7 +274,6 @@ config SENSORS_LM90
 config SENSORS_LM92
        tristate "National Semiconductor LM92 and compatibles"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for National Semiconductor LM92
          and Maxim MAX6635 sensor chips.
@@ -286,7 +284,6 @@ config SENSORS_LM92
 config SENSORS_MAX1619
        tristate "Maxim MAX1619 sensor chip"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for MAX1619 sensor chip.
@@ -296,8 +293,8 @@ config SENSORS_MAX1619
 config SENSORS_PC87360
        tristate "National Semiconductor PC87360 family"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        select I2C_ISA
+        select HWMON_VID
        help
          If you say yes here you get access to the hardware monitoring
          functions of the National Semiconductor PC8736x Super-I/O chips.
@@ -311,7 +308,6 @@ config SENSORS_PC87360
 config SENSORS_SIS5595
        tristate "Silicon Integrated Systems Corp. SiS5595"
        depends on HWMON && I2C && PCI && EXPERIMENTAL
-        select I2C_SENSOR
        select I2C_ISA
        help
          If you say yes here you get support for the integrated sensors in
@@ -323,7 +319,6 @@ config SENSORS_SIS5595
 config SENSORS_SMSC47M1
        tristate "SMSC LPC47M10x and compatibles"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        select I2C_ISA
        help
          If you say yes here you get support for the integrated fan
@@ -336,7 +331,6 @@ config SENSORS_SMSC47M1
 config SENSORS_SMSC47B397
        tristate "SMSC LPC47B397-NC"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        select I2C_ISA
        help
          If you say yes here you get support for the SMSC LPC47B397-NC
@@ -348,7 +342,6 @@ config SENSORS_SMSC47B397
 config SENSORS_VIA686A
        tristate "VIA686A"
        depends on HWMON && I2C && PCI
-        select I2C_SENSOR
        select I2C_ISA
        help
          If you say yes here you get support for the integrated sensors in
@@ -360,7 +353,8 @@ config SENSORS_VIA686A
 config SENSORS_W83781D
        tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
        depends on HWMON && I2C
-        select I2C_SENSOR
+        select I2C_ISA
+        select HWMON_VID
        help
          If you say yes here you get support for the Winbond W8378x series
          of sensor chips: the W83781D, W83782D, W83783S and W83627HF,
@@ -369,10 +363,18 @@ config SENSORS_W83781D
          This driver can also be built as a module.  If so, the module
          will be called w83781d.
+config SENSORS_W83792D
+        tristate "Winbond W83792D"
+        depends on HWMON && I2C && EXPERIMENTAL
+        help
+          If you say yes here you get support for the Winbond W83792D chip.
+          This driver can also be built as a module.  If so, the module
+          will be called w83792d.
 config SENSORS_W83L785TS
        tristate "Winbond W83L785TS-S"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for the Winbond W83L785TS-S
          sensor chip, which is used on the Asus A7N8X, among other
@@ -384,8 +386,8 @@ config SENSORS_W83L785TS
 config SENSORS_W83627HF
        tristate "Winbond W83627HF, W83627THF, W83637HF, W83697HF"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        select I2C_ISA
+        select HWMON_VID
        help
          If you say yes here you get support for the Winbond W836X7 series
          of sensor chips: the W83627HF, W83627THF, W83637HF, and the W83697HF
@@ -396,7 +398,6 @@ config SENSORS_W83627HF
 config SENSORS_W83627EHF
        tristate "Winbond W83627EHF"
        depends on HWMON && I2C && EXPERIMENTAL
-        select I2C_SENSOR
        select I2C_ISA
        help
          If you say yes here you get preliminary support for the hardware
@@ -404,6 +405,9 @@ config SENSORS_W83627EHF
          Only fan and temperature inputs are supported at the moment, while
          the chip does much more than that.
+          This driver also supports the W83627EHG, which is the lead-free
+          version of the W83627EHF.
          This driver can also be built as a module.  If so, the module
          will be called w83627ehf.
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index 2781403a0236..381f1bf04cc5 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -2,9 +2,13 @@
 # Makefile for sensor chip drivers.
 #
+obj-$(CONFIG_HWMON)             += hwmon.o
+obj-$(CONFIG_HWMON_VID)         += hwmon-vid.o
 # asb100, then w83781d go first, as they can override other drivers' addresses.
 obj-$(CONFIG_SENSORS_ASB100)    += asb100.o
 obj-$(CONFIG_SENSORS_W83627HF)  += w83627hf.o
+obj-$(CONFIG_SENSORS_W83792D)   += w83792d.o
 obj-$(CONFIG_SENSORS_W83781D)   += w83781d.o
 obj-$(CONFIG_SENSORS_ADM1021)   += adm1021.o
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index d2c774c32f45..e928cdb041cb 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -24,7 +24,8 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 /* Addresses to scan */
@@ -32,10 +33,9 @@ static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
                                        0x29, 0x2a, 0x2b,
                                        0x4c, 0x4d, 0x4e, 
                                        I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066);
+I2C_CLIENT_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066);
 /* adm1021 constants specified below */
@@ -89,6 +89,7 @@ clearing it.  Weird, ey?   --Phil  */
 /* Each client has this additional data */
 struct adm1021_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        enum chips type;
        struct semaphore update_lock;
@@ -185,7 +186,7 @@ static int adm1021_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, adm1021_detect);
+        return i2c_probe(adapter, &addr_data, adm1021_detect);
 }
 static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -196,15 +197,6 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
        int err = 0;
        const char *type_name = "";
-        /* Make sure we aren't probing the ISA bus!! This is just a safety check
-           at this moment; i2c_detect really won't call us. */
-#ifdef DEBUG
-        if (i2c_is_isa_adapter(adapter)) {
-                dev_dbg(&adapter->dev, "adm1021_detect called for an ISA bus adapter?!?\n");
-                return 0;
-        }
-#endif
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                goto error0;
@@ -295,6 +287,12 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
                adm1021_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error2;
+        }
        device_create_file(&new_client->dev, &dev_attr_temp1_max);
        device_create_file(&new_client->dev, &dev_attr_temp1_min);
        device_create_file(&new_client->dev, &dev_attr_temp1_input);
@@ -305,6 +303,8 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+error2:
+        i2c_detach_client(new_client);
 error1:
        kfree(data);
 error0:
@@ -322,14 +322,15 @@ static void adm1021_init_client(struct i2c_client *client)
 static int adm1021_detach_client(struct i2c_client *client)
 {
+        struct adm1021_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c
index e452d0daf906..526b7ff179eb 100644
--- a/drivers/hwmon/adm1025.c
+++ b/drivers/hwmon/adm1025.c
@@ -50,8 +50,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 /*
 * Addresses to scan
@@ -60,13 +61,12 @@
 */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /*
 * Insmod parameters
 */
-SENSORS_INSMOD_2(adm1025, ne1619);
+I2C_CLIENT_INSMOD_2(adm1025, ne1619);
 /*
 * The ADM1025 registers
@@ -132,6 +132,7 @@ static struct i2c_driver adm1025_driver = {
 struct adm1025_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid; /* zero until following fields are valid */
        unsigned long last_updated; /* in jiffies */
@@ -312,7 +313,7 @@ static int adm1025_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, adm1025_detect);
+        return i2c_probe(adapter, &addr_data, adm1025_detect);
 }
 /*
@@ -416,6 +417,12 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
        adm1025_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_in0_input);
        device_create_file(&new_client->dev, &dev_attr_in1_input);
        device_create_file(&new_client->dev, &dev_attr_in2_input);
@@ -452,6 +459,8 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -464,7 +473,7 @@ static void adm1025_init_client(struct i2c_client *client)
        struct adm1025_data *data = i2c_get_clientdata(client);
        int i;
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
        /*
         * Set high limits
@@ -502,15 +511,15 @@ static void adm1025_init_client(struct i2c_client *client)
 static int adm1025_detach_client(struct i2c_client *client)
 {
+        struct adm1025_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c
index c8a7f47911f9..625158110fd4 100644
--- a/drivers/hwmon/adm1026.c
+++ b/drivers/hwmon/adm1026.c
@@ -28,16 +28,16 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
-#include <linux/i2c-vid.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_1(adm1026);
+I2C_CLIENT_INSMOD_1(adm1026);
 static int gpio_input[17]  = { -1, -1, -1, -1, -1, -1, -1, -1, -1,
                                -1, -1, -1, -1, -1, -1, -1, -1 }; 
@@ -259,6 +259,7 @@ struct pwm_data {
 struct adm1026_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore lock;
        enum chips type;
@@ -319,13 +320,15 @@ int adm1026_attach_adapter(struct i2c_adapter *adapter)
        if (!(adapter->class & I2C_CLASS_HWMON)) {
                return 0;
        }
-        return i2c_detect(adapter, &addr_data, adm1026_detect);
+        return i2c_probe(adapter, &addr_data, adm1026_detect);
 }
 int adm1026_detach_client(struct i2c_client *client)
 {
+        struct adm1026_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
        i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
@@ -1549,12 +1552,18 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
                goto exitfree;
        /* Set the VRM version */
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
        /* Initialize the ADM1026 chip */
        adm1026_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exitdetach;
+        }
        device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
        device_create_file(&new_client->dev, &sensor_dev_attr_in0_max.dev_attr);
        device_create_file(&new_client->dev, &sensor_dev_attr_in0_min.dev_attr);
@@ -1690,6 +1699,8 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
        return 0;
        /* Error out and cleanup code */
+exitdetach:
+        i2c_detach_client(new_client);
 exitfree:
        kfree(data);
 exit:
diff --git a/drivers/hwmon/adm1031.c b/drivers/hwmon/adm1031.c
index 936250957270..58338ed7c8a1 100644
--- a/drivers/hwmon/adm1031.c
+++ b/drivers/hwmon/adm1031.c
@@ -26,7 +26,8 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 /* Following macros takes channel parameter starting from 0 to 2 */
 #define ADM1031_REG_FAN_SPEED(nr)       (0x08 + (nr))
@@ -59,16 +60,16 @@
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_2(adm1030, adm1031);
+I2C_CLIENT_INSMOD_2(adm1030, adm1031);
 typedef u8 auto_chan_table_t[8][2];
 /* Each client has this additional data */
 struct adm1031_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        int chip_type;
        char valid;             /* !=0 if following fields are valid */
@@ -725,10 +726,10 @@ static int adm1031_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, adm1031_detect);
+        return i2c_probe(adapter, &addr_data, adm1031_detect);
 }
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
 {
        struct i2c_client *new_client;
@@ -788,6 +789,12 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
        adm1031_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_fan1_input);
        device_create_file(&new_client->dev, &dev_attr_fan1_div);
        device_create_file(&new_client->dev, &dev_attr_fan1_min);
@@ -833,6 +840,8 @@ static int adm1031_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -841,11 +850,14 @@ exit:
 static int adm1031_detach_client(struct i2c_client *client)
 {
+        struct adm1031_data *data = i2c_get_clientdata(client);
        int ret;
+        hwmon_device_unregister(data->class_dev);
        if ((ret = i2c_detach_client(client)) != 0) {
                return ret;
        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index ce2a6eb93f6e..bc7faef162f7 100644
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -45,17 +45,16 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
                                        I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_3(adm9240, ds1780, lm81);
+I2C_CLIENT_INSMOD_3(adm9240, ds1780, lm81);
 /* ADM9240 registers */
 #define ADM9240_REG_MAN_ID              0x3e
@@ -150,6 +149,7 @@ static struct i2c_driver adm9240_driver = {
 struct adm9240_data {
        enum chips type;
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid;
        unsigned long last_updated_measure;
@@ -582,6 +582,12 @@ static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind)
        adm9240_init_client(new_client);
        /* populate sysfs filesystem */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_in0_input);
        device_create_file(&new_client->dev, &dev_attr_in0_min);
        device_create_file(&new_client->dev, &dev_attr_in0_max);
@@ -615,6 +621,9 @@ static int adm9240_detect(struct i2c_adapter *adapter, int address, int kind)
        device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -625,20 +634,20 @@ static int adm9240_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, adm9240_detect);
+        return i2c_probe(adapter, &addr_data, adm9240_detect);
 }
 static int adm9240_detach_client(struct i2c_client *client)
 {
+        struct adm9240_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                                "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
@@ -648,7 +657,7 @@ static void adm9240_init_client(struct i2c_client *client)
        u8 conf = adm9240_read_value(client, ADM9240_REG_CONFIG);
        u8 mode = adm9240_read_value(client, ADM9240_REG_TEMP_CONF) & 3;
-        data->vrm = i2c_which_vrm(); /* need this to report vid as mV */
+        data->vrm = vid_which_vrm(); /* need this to report vid as mV */
        dev_info(&client->dev, "Using VRM: %d.%d\n", data->vrm / 10,
                        data->vrm % 10);
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 70d996d6fe0a..8e34855a6274 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -39,8 +39,9 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include "lm75.h"
@@ -54,11 +55,8 @@
 /* I2C addresses to scan */
 static unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END };
-/* ISA addresses to scan (none) */
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_1(asb100);
+I2C_CLIENT_INSMOD_1(asb100);
 I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
        "{bus, clientaddr, subclientaddr1, subclientaddr2}");
@@ -183,6 +181,7 @@ static u8 DIV_TO_REG(long val)
   dynamically allocated, at the same time the client itself is allocated. */
 struct asb100_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore lock;
        enum chips type;
@@ -621,7 +620,7 @@ static int asb100_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, asb100_detect);
+        return i2c_probe(adapter, &addr_data, asb100_detect);
 }
 static int asb100_detect_subclients(struct i2c_adapter *adapter, int address,
@@ -714,14 +713,6 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
        struct i2c_client *new_client;
        struct asb100_data *data;
-        /* asb100 is SMBus only */
-        if (i2c_is_isa_adapter(adapter)) {
-                pr_debug("asb100.o: detect failed, "
-                                "cannot attach to legacy adapter!\n");
-                err = -ENODEV;
-                goto ERROR0;
-        }
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                pr_debug("asb100.o: detect failed, "
                                "smbus byte data not supported!\n");
@@ -821,6 +812,12 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
        data->fan_min[2] = asb100_read_value(new_client, ASB100_REG_FAN_MIN(2));
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
        device_create_file_in(new_client, 0);
        device_create_file_in(new_client, 1);
        device_create_file_in(new_client, 2);
@@ -847,6 +844,11 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+ERROR3:
+        i2c_detach_client(data->lm75[1]);
+        i2c_detach_client(data->lm75[0]);
+        kfree(data->lm75[1]);
+        kfree(data->lm75[0]);
 ERROR2:
        i2c_detach_client(new_client);
 ERROR1:
@@ -857,21 +859,23 @@ ERROR0:
 static int asb100_detach_client(struct i2c_client *client)
 {
+        struct asb100_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        /* main client */
-                dev_err(&client->dev, "client deregistration failed; "
+        if (data)
-                        "client not detached.\n");
+                hwmon_device_unregister(data->class_dev);
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        if (i2c_get_clientdata(client)==NULL) {
+        /* main client */
-                /* subclients */
+        if (data)
+                kfree(data);
+        /* subclient */
+        else
                kfree(client);
-        } else {
-                /* main client */
-                kfree(i2c_get_clientdata(client));
-        }
        return 0;
 }
@@ -969,7 +973,7 @@ static void asb100_init_client(struct i2c_client *client)
        vid = asb100_read_value(client, ASB100_REG_VID_FANDIV) & 0x0f;
        vid |= (asb100_read_value(client, ASB100_REG_CHIPID) & 0x01) << 4;
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
        vid = vid_from_reg(vid, data->vrm);
        /* Start monitoring */
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index fca3fc1cef72..deb4d34c9539 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -23,8 +23,9 @@
 #include <linux/module.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("System voltages control via Attansic ATXP1");
@@ -40,9 +41,8 @@ MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
 #define ATXP1_GPIO1MASK 0x0f
 static unsigned short normal_i2c[] = { 0x37, 0x4e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
-SENSORS_INSMOD_1(atxp1);
+I2C_CLIENT_INSMOD_1(atxp1);
 static int atxp1_attach_adapter(struct i2c_adapter * adapter);
 static int atxp1_detach_client(struct i2c_client * client);
@@ -59,6 +59,7 @@ static struct i2c_driver atxp1_driver = {
 struct atxp1_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        unsigned long last_updated;
        u8 valid;
@@ -252,7 +253,7 @@ static DEVICE_ATTR(gpio2, S_IRUGO | S_IWUSR, atxp1_showgpio2, atxp1_storegpio2);
 static int atxp1_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, &atxp1_detect);
+        return i2c_probe(adapter, &addr_data, &atxp1_detect);
 };
 static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -295,7 +296,7 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
        }
        /* Get VRM */
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
        if ((data->vrm != 90) && (data->vrm != 91)) {
                dev_err(&new_client->dev, "Not supporting VRM %d.%d\n",
@@ -317,6 +318,12 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
                goto exit_free;
        }
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_gpio1);
        device_create_file(&new_client->dev, &dev_attr_gpio2);
        device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
@@ -326,6 +333,8 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -334,14 +343,17 @@ exit:
 static int atxp1_detach_client(struct i2c_client * client)
 {
+        struct atxp1_data * data = i2c_get_clientdata(client);
        int err;
+        hwmon_device_unregister(data->class_dev);
        err = i2c_detach_client(client);
        if (err)
                dev_err(&client->dev, "Failed to detach client.\n");
        else
-                kfree(i2c_get_clientdata(client));
+                kfree(data);
        return err;
 };
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 5360d58804f6..b0199e063d0e 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -26,16 +26,16 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include "lm75.h"
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                        0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_1(ds1621);
+I2C_CLIENT_INSMOD_1(ds1621);
 static int polarity = -1;
 module_param(polarity, int, 0);
 MODULE_PARM_DESC(polarity, "Output's polarity: 0 = active high, 1 = active low");
@@ -71,6 +71,7 @@ MODULE_PARM_DESC(polarity, "Output's polarity: 0 = active high, 1 = active low")
 /* Each client has this additional data */
 struct ds1621_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid;                     /* !=0 if following fields are valid */
        unsigned long last_updated;     /* In jiffies */
@@ -179,10 +180,10 @@ static DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_max, set_temp_max);
 static int ds1621_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, ds1621_detect);
+        return i2c_probe(adapter, &addr_data, ds1621_detect);
 }
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int ds1621_detect(struct i2c_adapter *adapter, int address,
                  int kind)
 {
@@ -250,6 +251,12 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
        ds1621_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_alarms);
        device_create_file(&new_client->dev, &dev_attr_temp1_input);
        device_create_file(&new_client->dev, &dev_attr_temp1_min);
@@ -259,6 +266,8 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
 /* OK, this is not exactly good programming practice, usually. But it is
   very code-efficient in this case. */
+      exit_detach:
+        i2c_detach_client(new_client);
      exit_free:
        kfree(data);
      exit:
@@ -267,15 +276,15 @@ int ds1621_detect(struct i2c_adapter *adapter, int address,
 static int ds1621_detach_client(struct i2c_client *client)
 {
+        struct ds1621_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index da411741c2c5..eef6061d786b 100644
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -31,20 +31,20 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 /*
 * Addresses to scan
 */
 static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /*
 * Insmod parameters
 */
-SENSORS_INSMOD_1(fscher);
+I2C_CLIENT_INSMOD_1(fscher);
 /*
 * The FSCHER registers
@@ -132,6 +132,7 @@ static struct i2c_driver fscher_driver = {
 struct fscher_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid; /* zero until following fields are valid */
        unsigned long last_updated; /* in jiffies */
@@ -287,7 +288,7 @@ static int fscher_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, fscher_detect);
+        return i2c_probe(adapter, &addr_data, fscher_detect);
 }
 static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -341,6 +342,12 @@ static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
        fscher_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file_revision(new_client);
        device_create_file_alarms(new_client);
        device_create_file_control(new_client);
@@ -360,6 +367,8 @@ static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -368,15 +377,15 @@ exit:
 static int fscher_detach_client(struct i2c_client *client)
 {
+        struct fscher_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c
index 301ae98bd0ad..5fc77a5fed07 100644
--- a/drivers/hwmon/fscpos.c
+++ b/drivers/hwmon/fscpos.c
@@ -34,19 +34,19 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/init.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 /*
 * Addresses to scan
 */
 static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /*
 * Insmod parameters
 */
-SENSORS_INSMOD_1(fscpos);
+I2C_CLIENT_INSMOD_1(fscpos);
 /*
 * The FSCPOS registers
@@ -113,6 +113,7 @@ static struct i2c_driver fscpos_driver = {
 */
 struct fscpos_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid;             /* 0 until following fields are valid */
        unsigned long last_updated;     /* In jiffies */
@@ -434,7 +435,7 @@ static int fscpos_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, fscpos_detect);
+        return i2c_probe(adapter, &addr_data, fscpos_detect);
 }
 int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -496,6 +497,12 @@ int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
        dev_info(&new_client->dev, "Found fscpos chip, rev %u\n", data->revision);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_event);
        device_create_file(&new_client->dev, &dev_attr_in0_input);
        device_create_file(&new_client->dev, &dev_attr_in1_input);
@@ -526,6 +533,8 @@ int fscpos_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -534,14 +543,14 @@ exit:
 static int fscpos_detach_client(struct i2c_client *client)
 {
+        struct fscpos_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, client"
-                                                        " not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
+        kfree(data);
-        kfree(i2c_get_clientdata(client));
        return 0;
 }
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index 6bedf729dcf5..256b9323c84b 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -41,14 +41,14 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_2(gl518sm_r00, gl518sm_r80);
+I2C_CLIENT_INSMOD_2(gl518sm_r00, gl518sm_r80);
 /* Many GL518 constants specified below */
@@ -117,6 +117,7 @@ static inline u8 FAN_TO_REG(long rpm, int div)
 /* Each client has this additional data */
 struct gl518_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        enum chips type;
        struct semaphore update_lock;
@@ -346,7 +347,7 @@ static int gl518_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, gl518_detect);
+        return i2c_probe(adapter, &addr_data, gl518_detect);
 }
 static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -419,6 +420,12 @@ static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
        gl518_init_client((struct i2c_client *) new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_in0_input);
        device_create_file(&new_client->dev, &dev_attr_in1_input);
        device_create_file(&new_client->dev, &dev_attr_in2_input);
@@ -450,6 +457,8 @@ static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
 /* OK, this is not exactly good programming practice, usually. But it is
   very code-efficient in this case. */
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -477,16 +486,15 @@ static void gl518_init_client(struct i2c_client *client)
 static int gl518_detach_client(struct i2c_client *client)
 {
+        struct gl518_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
-                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        if ((err = i2c_detach_client(client)))
+                return err;
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index 80ae8d30c2af..12fd757066fc 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -26,8 +26,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 /* Type of the extra sensor */
 static unsigned short extra_sensor_type;
@@ -36,10 +37,9 @@ MODULE_PARM_DESC(extra_sensor_type, "Type of extra sensor (0=autodetect, 1=tempe
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_1(gl520sm);
+I2C_CLIENT_INSMOD_1(gl520sm);
 /* Many GL520 constants specified below 
 One of the inputs can be configured as either temp or voltage.
@@ -120,6 +120,7 @@ static struct i2c_driver gl520_driver = {
 /* Client data */
 struct gl520_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid;             /* zero until the following fields are valid */
        unsigned long last_updated;     /* in jiffies */
@@ -518,7 +519,7 @@ static int gl520_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, gl520_detect);
+        return i2c_probe(adapter, &addr_data, gl520_detect);
 }
 static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -571,6 +572,12 @@ static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
        gl520_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file_vid(new_client, 0);
        device_create_file_in(new_client, 0);
@@ -592,6 +599,8 @@ static int gl520_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -608,7 +617,7 @@ static void gl520_init_client(struct i2c_client *client)
        conf = oldconf = gl520_read_value(client, GL520_REG_CONF);
        data->alarm_mask = 0xff;
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
        if (extra_sensor_type == 1)
                conf &= ~0x10;
@@ -639,15 +648,15 @@ static void gl520_init_client(struct i2c_client *client)
 static int gl520_detach_client(struct i2c_client *client)
 {
+        struct gl520_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c
new file mode 100644
index 000000000000..312769ad4dab
--- /dev/null
+++ b/drivers/hwmon/hwmon-vid.c
@@ -0,0 +1,189 @@
+/*
+    hwmon-vid.c - VID/VRM/VRD voltage conversions
+    Copyright (c) 2004 Rudolf Marek <r.marek@sh.cvut.cz>
+    Partly imported from i2c-vid.h of the lm_sensors project
+    Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
+    With assistance from Trent Piepho <xyzzy@speakeasy.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 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/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/hwmon-vid.h>
+/*
+    Common code for decoding VID pins.
+    References:
+    For VRM 8.4 to 9.1, "VRM x.y DC-DC Converter Design Guidelines",
+    available at http://developer.intel.com/.
+    For VRD 10.0 and up, "VRD x.y Design Guide",
+    available at http://developer.intel.com/.
+    AMD Opteron processors don't follow the Intel specifications.
+    I'm going to "make up" 2.4 as the spec number for the Opterons.
+    No good reason just a mnemonic for the 24x Opteron processor
+    series.
+    Opteron VID encoding is:
+       00000  =  1.550 V
+       00001  =  1.525 V
+        . . . .
+       11110  =  0.800 V
+       11111  =  0.000 V (off)
+*/
+/* vrm is the VRM/VRD document version multiplied by 10.
+   val is the 4-, 5- or 6-bit VID code.
+   Returned value is in mV to avoid floating point in the kernel. */
+int vid_from_reg(int val, int vrm)
+{
+        int vid;
+        switch(vrm) {
+        case  0:
+                return 0;
+        case 100:               /* VRD 10.0 */
+                if((val & 0x1f) == 0x1f)
+                        return 0;
+                if((val & 0x1f) <= 0x09 || val == 0x0a)
+                        vid = 10875 - (val & 0x1f) * 250;
+                else
+                        vid = 18625 - (val & 0x1f) * 250;
+                if(val & 0x20)
+                        vid -= 125;
+                vid /= 10;      /* only return 3 dec. places for now */
+                return vid;
+        case 24:                /* Opteron processor */
+                return(val == 0x1f ? 0 : 1550 - val * 25);
+        case 91:                /* VRM 9.1 */
+        case 90:                /* VRM 9.0 */
+                return(val == 0x1f ? 0 :
+                                       1850 - val * 25);
+        case 85:                /* VRM 8.5 */
+                return((val & 0x10  ? 25 : 0) +
+                       ((val & 0x0f) > 0x04 ? 2050 : 1250) -
+                       ((val & 0x0f) * 50));
+        case 84:                /* VRM 8.4 */
+                val &= 0x0f;
+                                /* fall through */
+        default:                /* VRM 8.2 */
+                return(val == 0x1f ? 0 :
+                       val & 0x10  ? 5100 - (val) * 100 :
+                                     2050 - (val) * 50);
+        }
+}
+/*
+    After this point is the code to automatically determine which
+    VRM/VRD specification should be used depending on the CPU.
+*/
+struct vrm_model {
+        u8 vendor;
+        u8 eff_family;
+        u8 eff_model;
+        int vrm_type;
+};
+#define ANY 0xFF
+#ifdef CONFIG_X86
+static struct vrm_model vrm_models[] = {
+        {X86_VENDOR_AMD, 0x6, ANY, 90},         /* Athlon Duron etc */
+        {X86_VENDOR_AMD, 0xF, ANY, 24},         /* Athlon 64, Opteron */
+        {X86_VENDOR_INTEL, 0x6, 0x9, 85},       /* 0.13um too */
+        {X86_VENDOR_INTEL, 0x6, 0xB, 85},       /* Tualatin */
+        {X86_VENDOR_INTEL, 0x6, ANY, 82},       /* any P6 */
+        {X86_VENDOR_INTEL, 0x7, ANY, 0},        /* Itanium */
+        {X86_VENDOR_INTEL, 0xF, 0x0, 90},       /* P4 */
+        {X86_VENDOR_INTEL, 0xF, 0x1, 90},       /* P4 Willamette */
+        {X86_VENDOR_INTEL, 0xF, 0x2, 90},       /* P4 Northwood */
+        {X86_VENDOR_INTEL, 0xF, 0x3, 100},      /* P4 Prescott */
+        {X86_VENDOR_INTEL, 0xF, 0x4, 100},      /* P4 Prescott */
+        {X86_VENDOR_INTEL, 0x10,ANY, 0},        /* Itanium 2 */
+        {X86_VENDOR_UNKNOWN, ANY, ANY, 0}       /* stop here */
+};
+static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor)
+{
+        int i = 0;
+        while (vrm_models[i].vendor!=X86_VENDOR_UNKNOWN) {
+                if (vrm_models[i].vendor==vendor)
+                        if ((vrm_models[i].eff_family==eff_family)
+                         && ((vrm_models[i].eff_model==eff_model) ||
+                             (vrm_models[i].eff_model==ANY)))
+                                return vrm_models[i].vrm_type;
+                i++;
+        }
+        return 0;
+}
+int vid_which_vrm(void)
+{
+        struct cpuinfo_x86 *c = cpu_data;
+        u32 eax;
+        u8 eff_family, eff_model;
+        int vrm_ret;
+        if (c->x86 < 6)         /* Any CPU with family lower than 6 */
+                return 0;       /* doesn't have VID and/or CPUID */
+        eax = cpuid_eax(1);
+        eff_family = ((eax & 0x00000F00)>>8);
+        eff_model  = ((eax & 0x000000F0)>>4);
+        if (eff_family == 0xF) {        /* use extended model & family */
+                eff_family += ((eax & 0x00F00000)>>20);
+                eff_model += ((eax & 0x000F0000)>>16)<<4;
+        }
+        vrm_ret = find_vrm(eff_family,eff_model,c->x86_vendor);
+        if (vrm_ret == 0)
+                printk(KERN_INFO "hwmon-vid: Unknown VRM version of your "
+                       "x86 CPU\n");
+        return vrm_ret;
+}
+/* and now something completely different for the non-x86 world */
+#else
+int vid_which_vrm(void)
+{
+        printk(KERN_INFO "hwmon-vid: Unknown VRM version of your CPU\n");
+        return 0;
+}
+#endif
+EXPORT_SYMBOL(vid_from_reg);
+EXPORT_SYMBOL(vid_which_vrm);
+MODULE_AUTHOR("Rudolf Marek <r.marek@sh.cvut.cz>");
+MODULE_DESCRIPTION("hwmon-vid driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
new file mode 100644
index 000000000000..9b41c9bd805f
--- /dev/null
+++ b/drivers/hwmon/hwmon.c
@@ -0,0 +1,98 @@
+/*
+    hwmon.c - part of lm_sensors, Linux kernel modules for hardware monitoring
+    This file defines the sysfs class "hwmon", for use by sensors drivers.
+    Copyright (C) 2005 Mark M. Hoffman <mhoffman@lightlink.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; version 2 of the License.
+*/
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/kdev_t.h>
+#include <linux/idr.h>
+#include <linux/hwmon.h>
+#define HWMON_ID_PREFIX "hwmon"
+#define HWMON_ID_FORMAT HWMON_ID_PREFIX "%d"
+static struct class *hwmon_class;
+static DEFINE_IDR(hwmon_idr);
+/**
+ * hwmon_device_register - register w/ hwmon sysfs class
+ * @dev: the device to register
+ *
+ * hwmon_device_unregister() must be called when the class device is no
+ * longer needed.
+ *
+ * Returns the pointer to the new struct class device.
+ */
+struct class_device *hwmon_device_register(struct device *dev)
+{
+        struct class_device *cdev;
+        int id;
+        if (idr_pre_get(&hwmon_idr, GFP_KERNEL) == 0)
+                return ERR_PTR(-ENOMEM);
+        if (idr_get_new(&hwmon_idr, NULL, &id) < 0)
+                return ERR_PTR(-ENOMEM);
+        id = id & MAX_ID_MASK;
+        cdev = class_device_create(hwmon_class, MKDEV(0,0), dev,
+                                        HWMON_ID_FORMAT, id);
+        if (IS_ERR(cdev))
+                idr_remove(&hwmon_idr, id);
+        return cdev;
+}
+/**
+ * hwmon_device_unregister - removes the previously registered class device
+ *
+ * @cdev: the class device to destroy
+ */
+void hwmon_device_unregister(struct class_device *cdev)
+{
+        int id;
+        if (sscanf(cdev->class_id, HWMON_ID_FORMAT, &id) == 1) {
+                class_device_unregister(cdev);
+                idr_remove(&hwmon_idr, id);
+        } else
+                dev_dbg(cdev->dev,
+                        "hwmon_device_unregister() failed: bad class ID!\n");
+}
+static int __init hwmon_init(void)
+{
+        hwmon_class = class_create(THIS_MODULE, "hwmon");
+        if (IS_ERR(hwmon_class)) {
+                printk(KERN_ERR "hwmon.c: couldn't create sysfs class\n");
+                return PTR_ERR(hwmon_class);
+        }
+        return 0;
+}
+static void __exit hwmon_exit(void)
+{
+        class_destroy(hwmon_class);
+}
+module_init(hwmon_init);
+module_exit(hwmon_exit);
+EXPORT_SYMBOL_GPL(hwmon_device_register);
+EXPORT_SYMBOL_GPL(hwmon_device_unregister);
+MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");
+MODULE_DESCRIPTION("hardware monitoring sysfs/class support");
+MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index db20c9e47393..53cc2b6d6385 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -36,19 +36,21 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
                                        0x2e, 0x2f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
+static unsigned short isa_address = 0x290;
 /* Insmod parameters */
-SENSORS_INSMOD_2(it87, it8712);
+I2C_CLIENT_INSMOD_2(it87, it8712);
 #define REG     0x2e    /* The register to read/write */
 #define DEV     0x07    /* Register: Logical device select */
@@ -192,6 +194,7 @@ static int DIV_TO_REG(int val)
   allocated. */
 struct it87_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore lock;
        enum chips type;
@@ -218,7 +221,7 @@ struct it87_data {
 static int it87_attach_adapter(struct i2c_adapter *adapter);
-static int it87_find(int *address);
+static int it87_isa_attach_adapter(struct i2c_adapter *adapter);
 static int it87_detect(struct i2c_adapter *adapter, int address, int kind);
 static int it87_detach_client(struct i2c_client *client);
@@ -239,6 +242,14 @@ static struct i2c_driver it87_driver = {
        .detach_client  = it87_detach_client,
 };
+static struct i2c_driver it87_isa_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "it87-isa",
+        .attach_adapter = it87_isa_attach_adapter,
+        .detach_client  = it87_detach_client,
+};
 static ssize_t show_in(struct device *dev, struct device_attribute *attr,
                char *buf)
 {
@@ -686,11 +697,16 @@ static int it87_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, it87_detect);
+        return i2c_probe(adapter, &addr_data, it87_detect);
 }
-/* SuperIO detection - will change normal_isa[0] if a chip is found */
+static int it87_isa_attach_adapter(struct i2c_adapter *adapter)
-static int it87_find(int *address)
+{
+        return it87_detect(adapter, isa_address, -1);
+}
+/* SuperIO detection - will change isa_address if a chip is found */
+static int __init it87_find(int *address)
 {
        int err = -ENODEV;
@@ -721,7 +737,7 @@ exit:
        return err;
 }
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int it87_detect(struct i2c_adapter *adapter, int address, int kind)
 {
        int i;
@@ -738,7 +754,7 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
        /* Reserve the ISA region */
        if (is_isa)
-                if (!request_region(address, IT87_EXTENT, it87_driver.name))
+                if (!request_region(address, IT87_EXTENT, it87_isa_driver.name))
                        goto ERROR0;
        /* Probe whether there is anything available on this address. Already
@@ -784,7 +800,7 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
        i2c_set_clientdata(new_client, data);
        new_client->addr = address;
        new_client->adapter = adapter;
-        new_client->driver = &it87_driver;
+        new_client->driver = is_isa ? &it87_isa_driver : &it87_driver;
        new_client->flags = 0;
        /* Now, we do the remaining detection. */
@@ -840,6 +856,12 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
        it87_init_client(new_client, data);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
        device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
        device_create_file(&new_client->dev, &sensor_dev_attr_in1_input.dev_attr);
        device_create_file(&new_client->dev, &sensor_dev_attr_in2_input.dev_attr);
@@ -897,13 +919,15 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
        }
        if (data->type == it8712) {
-                data->vrm = i2c_which_vrm();
+                data->vrm = vid_which_vrm();
                device_create_file_vrm(new_client);
                device_create_file_vid(new_client);
        }
        return 0;
+ERROR3:
+        i2c_detach_client(new_client);
 ERROR2:
        kfree(data);
 ERROR1:
@@ -915,17 +939,17 @@ ERROR0:
 static int it87_detach_client(struct i2c_client *client)
 {
+        struct it87_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
        if(i2c_is_isa_client(client))
                release_region(client->addr, IT87_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
@@ -1158,16 +1182,28 @@ static struct it87_data *it87_update_device(struct device *dev)
 static int __init sm_it87_init(void)
 {
-        int addr;
+        int addr, res;
        if (!it87_find(&addr)) {
-                normal_isa[0] = addr;
+                isa_address = addr;
+        }
+        res = i2c_add_driver(&it87_driver);
+        if (res)
+                return res;
+        res = i2c_isa_add_driver(&it87_isa_driver);
+        if (res) {
+                i2c_del_driver(&it87_driver);
+                return res;
        }
-        return i2c_add_driver(&it87_driver);
+        return 0;
 }
 static void __exit sm_it87_exit(void)
 {
+        i2c_isa_del_driver(&it87_isa_driver);
        i2c_del_driver(&it87_driver);
 }
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c
index 7c6f9ea5a254..be5c7095ecbb 100644
--- a/drivers/hwmon/lm63.c
+++ b/drivers/hwmon/lm63.c
@@ -42,8 +42,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 /*
 * Addresses to scan
@@ -51,13 +52,12 @@
 */
 static unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /*
 * Insmod parameters
 */
-SENSORS_INSMOD_1(lm63);
+I2C_CLIENT_INSMOD_1(lm63);
 /*
 * The LM63 registers
@@ -152,6 +152,7 @@ static struct i2c_driver lm63_driver = {
 struct lm63_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid; /* zero until following fields are valid */
        unsigned long last_updated; /* in jiffies */
@@ -358,7 +359,7 @@ static int lm63_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, lm63_detect);
+        return i2c_probe(adapter, &addr_data, lm63_detect);
 }
 /*
@@ -437,6 +438,12 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind)
        lm63_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        if (data->config & 0x04) { /* tachometer enabled */
                device_create_file(&new_client->dev,
                                   &sensor_dev_attr_fan1_input.dev_attr);
@@ -462,6 +469,8 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -505,15 +514,15 @@ static void lm63_init_client(struct i2c_client *client)
 static int lm63_detach_client(struct i2c_client *client)
 {
+        struct lm63_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 5be164ed278e..9a3ebdf583f4 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -23,17 +23,17 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include "lm75.h"
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                        0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_1(lm75);
+I2C_CLIENT_INSMOD_1(lm75);
 /* Many LM75 constants specified below */
@@ -46,6 +46,7 @@ SENSORS_INSMOD_1(lm75);
 /* Each client has this additional data */
 struct lm75_data {
        struct i2c_client       client;
+        struct class_device *class_dev;
        struct semaphore        update_lock;
        char                    valid;          /* !=0 if following fields are valid */
        unsigned long           last_updated;   /* In jiffies */
@@ -107,10 +108,10 @@ static int lm75_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, lm75_detect);
+        return i2c_probe(adapter, &addr_data, lm75_detect);
 }
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
 {
        int i;
@@ -119,16 +120,6 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
        int err = 0;
        const char *name = "";
-        /* Make sure we aren't probing the ISA bus!! This is just a safety check
-           at this moment; i2c_detect really won't call us. */
-#ifdef DEBUG
-        if (i2c_is_isa_adapter(adapter)) {
-                dev_dbg(&adapter->dev,
-                        "lm75_detect called for an ISA bus adapter?!?\n");
-                goto exit;
-        }
-#endif
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
                                     I2C_FUNC_SMBUS_WORD_DATA))
                goto exit;
@@ -208,12 +199,20 @@ static int lm75_detect(struct i2c_adapter *adapter, int address, int kind)
        lm75_init_client(new_client);
        
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_temp1_max);
        device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);
        device_create_file(&new_client->dev, &dev_attr_temp1_input);
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -222,8 +221,10 @@ exit:
 static int lm75_detach_client(struct i2c_client *client)
 {
+        struct lm75_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
        i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
@@ -251,8 +252,12 @@ static int lm75_write_value(struct i2c_client *client, u8 reg, u16 value)
 static void lm75_init_client(struct i2c_client *client)
 {
-        /* Initialize the LM75 chip */
+        int reg;
-        lm75_write_value(client, LM75_REG_CONF, 0);
+        /* Enable if in shutdown mode */
+        reg = lm75_read_value(client, LM75_REG_CONF);
+        if (reg >= 0 && (reg & 0x01))
+                lm75_write_value(client, LM75_REG_CONF, reg & 0xfe);
 }
 static struct lm75_data *lm75_update_device(struct device *dev)
diff --git a/drivers/hwmon/lm75.h b/drivers/hwmon/lm75.h
index 63e3f2fb4c21..af7dc650ee15 100644
--- a/drivers/hwmon/lm75.h
+++ b/drivers/hwmon/lm75.h
@@ -25,7 +25,7 @@
    which contains this code, we don't worry about the wasted space.
 */
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
 /* straight from the datasheet */
 #define LM75_TEMP_MIN (-55000)
diff --git a/drivers/hwmon/lm77.c b/drivers/hwmon/lm77.c
index b98f44952997..866eab96a6f6 100644
--- a/drivers/hwmon/lm77.c
+++ b/drivers/hwmon/lm77.c
@@ -30,15 +30,14 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_1(lm77);
+I2C_CLIENT_INSMOD_1(lm77);
 /* The LM77 registers */
 #define LM77_REG_TEMP           0x00
@@ -51,6 +50,7 @@ SENSORS_INSMOD_1(lm77);
 /* Each client has this additional data */
 struct lm77_data {
        struct i2c_client       client;
+        struct class_device *class_dev;
        struct semaphore        update_lock;
        char                    valid;
        unsigned long           last_updated;   /* In jiffies */
@@ -208,10 +208,10 @@ static int lm77_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, lm77_detect);
+        return i2c_probe(adapter, &addr_data, lm77_detect);
 }
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
 {
        struct i2c_client *new_client;
@@ -317,6 +317,12 @@ static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
        lm77_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_temp1_input);
        device_create_file(&new_client->dev, &dev_attr_temp1_crit);
        device_create_file(&new_client->dev, &dev_attr_temp1_min);
@@ -327,6 +333,8 @@ static int lm77_detect(struct i2c_adapter *adapter, int address, int kind)
        device_create_file(&new_client->dev, &dev_attr_alarms);
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -335,8 +343,10 @@ exit:
 static int lm77_detach_client(struct i2c_client *client)
 {
+        struct lm77_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
        i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c
index 29241469dcba..f6730dc3573b 100644
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
@@ -23,7 +23,10 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 /* Addresses to scan */
@@ -31,10 +34,10 @@ static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24,
                                        0x25, 0x26, 0x27, 0x28, 0x29,
                                        0x2a, 0x2b, 0x2c, 0x2d, 0x2e,
                                        0x2f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
+static unsigned short isa_address = 0x290;
 /* Insmod parameters */
-SENSORS_INSMOD_3(lm78, lm78j, lm79);
+I2C_CLIENT_INSMOD_2(lm78, lm79);
 /* Many LM78 constants specified below */
@@ -104,13 +107,6 @@ static inline int TEMP_FROM_REG(s8 val)
        return val * 1000;
 }
-/* VID: mV
-   REG: (see doc/vid) */
-static inline int VID_FROM_REG(u8 val)
-{
-        return val==0x1f ? 0 : val>=0x10 ? 5100-val*100 : 2050-val*50;
-}
 #define DIV_FROM_REG(val) (1 << (val))
 /* There are some complications in a module like this. First off, LM78 chips
@@ -134,6 +130,7 @@ static inline int VID_FROM_REG(u8 val)
   allocated. */
 struct lm78_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore lock;
        enum chips type;
@@ -156,6 +153,7 @@ struct lm78_data {
 static int lm78_attach_adapter(struct i2c_adapter *adapter);
+static int lm78_isa_attach_adapter(struct i2c_adapter *adapter);
 static int lm78_detect(struct i2c_adapter *adapter, int address, int kind);
 static int lm78_detach_client(struct i2c_client *client);
@@ -174,6 +172,14 @@ static struct i2c_driver lm78_driver = {
        .detach_client  = lm78_detach_client,
 };
+static struct i2c_driver lm78_isa_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "lm78-isa",
+        .attach_adapter = lm78_isa_attach_adapter,
+        .detach_client  = lm78_detach_client,
+};
 /* 7 Voltages */
 static ssize_t show_in(struct device *dev, char *buf, int nr)
 {
@@ -445,7 +451,7 @@ static DEVICE_ATTR(fan3_div, S_IRUGO, show_fan_3_div, NULL);
 static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct lm78_data *data = lm78_update_device(dev);
-        return sprintf(buf, "%d\n", VID_FROM_REG(data->vid));
+        return sprintf(buf, "%d\n", vid_from_reg(82, data->vid));
 }
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
@@ -465,10 +471,15 @@ static int lm78_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, lm78_detect);
+        return i2c_probe(adapter, &addr_data, lm78_detect);
+}
+static int lm78_isa_attach_adapter(struct i2c_adapter *adapter)
+{
+        return lm78_detect(adapter, isa_address, -1);
 }
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
 {
        int i, err;
@@ -485,7 +496,8 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
        /* Reserve the ISA region */
        if (is_isa)
-                if (!request_region(address, LM78_EXTENT, lm78_driver.name)) {
+                if (!request_region(address, LM78_EXTENT,
+                                    lm78_isa_driver.name)) {
                        err = -EBUSY;
                        goto ERROR0;
                }
@@ -540,7 +552,7 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
        i2c_set_clientdata(new_client, data);
        new_client->addr = address;
        new_client->adapter = adapter;
-        new_client->driver = &lm78_driver;
+        new_client->driver = is_isa ? &lm78_isa_driver : &lm78_driver;
        new_client->flags = 0;
        /* Now, we do the remaining detection. */
@@ -559,10 +571,9 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
        /* Determine the chip type. */
        if (kind <= 0) {
                i = lm78_read_value(new_client, LM78_REG_CHIPID);
-                if (i == 0x00 || i == 0x20)
+                if (i == 0x00 || i == 0x20      /* LM78 */
+                 || i == 0x40)                  /* LM78-J */
                        kind = lm78;
-                else if (i == 0x40)
-                        kind = lm78j;
                else if ((i & 0xfe) == 0xc0)
                        kind = lm79;
                else {
@@ -578,8 +589,6 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
        if (kind == lm78) {
                client_name = "lm78";
-        } else if (kind == lm78j) {
-                client_name = "lm78-j";
        } else if (kind == lm79) {
                client_name = "lm79";
        }
@@ -605,6 +614,12 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
        }
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
        device_create_file(&new_client->dev, &dev_attr_in0_input);
        device_create_file(&new_client->dev, &dev_attr_in0_min);
        device_create_file(&new_client->dev, &dev_attr_in0_max);
@@ -643,6 +658,8 @@ int lm78_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+ERROR3:
+        i2c_detach_client(new_client);
 ERROR2:
        kfree(data);
 ERROR1:
@@ -654,18 +671,18 @@ ERROR0:
 static int lm78_detach_client(struct i2c_client *client)
 {
+        struct lm78_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev,
-                    "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
        if(i2c_is_isa_client(client))
                release_region(client->addr, LM78_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
@@ -777,18 +794,31 @@ static struct lm78_data *lm78_update_device(struct device *dev)
 static int __init sm_lm78_init(void)
 {
-        return i2c_add_driver(&lm78_driver);
+        int res;
+        res = i2c_add_driver(&lm78_driver);
+        if (res)
+                return res;
+        res = i2c_isa_add_driver(&lm78_isa_driver);
+        if (res) {
+                i2c_del_driver(&lm78_driver);
+                return res;
+        }
+        return 0;
 }
 static void __exit sm_lm78_exit(void)
 {
+        i2c_isa_del_driver(&lm78_isa_driver);
        i2c_del_driver(&lm78_driver);
 }
 MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>");
-MODULE_DESCRIPTION("LM78, LM78-J and LM79 driver");
+MODULE_DESCRIPTION("LM78/LM79 driver");
 MODULE_LICENSE("GPL");
 module_init(sm_lm78_init);
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index 8100595feb44..83af8b3a0cac 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -26,15 +26,15 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c,
                                        0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_1(lm80);
+I2C_CLIENT_INSMOD_1(lm80);
 /* Many LM80 constants specified below */
@@ -107,6 +107,7 @@ static inline long TEMP_FROM_REG(u16 temp)
 struct lm80_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid;             /* !=0 if following fields are valid */
        unsigned long last_updated;     /* In jiffies */
@@ -389,7 +390,7 @@ static int lm80_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, lm80_detect);
+        return i2c_probe(adapter, &addr_data, lm80_detect);
 }
 int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
@@ -451,6 +452,12 @@ int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
        data->fan_min[1] = lm80_read_value(new_client, LM80_REG_FAN_MIN(2));
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_in0_min);
        device_create_file(&new_client->dev, &dev_attr_in1_min);
        device_create_file(&new_client->dev, &dev_attr_in2_min);
@@ -487,6 +494,8 @@ int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+error_detach:
+        i2c_detach_client(new_client);
 error_free:
        kfree(data);
 exit:
@@ -495,15 +504,15 @@ exit:
 static int lm80_detach_client(struct i2c_client *client)
 {
+        struct lm80_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/lm83.c b/drivers/hwmon/lm83.c
index a49008b444c8..d74b2c20c719 100644
--- a/drivers/hwmon/lm83.c
+++ b/drivers/hwmon/lm83.c
@@ -32,8 +32,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 /*
 * Addresses to scan
@@ -45,13 +46,12 @@ static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
                                        0x29, 0x2a, 0x2b,
                                        0x4c, 0x4d, 0x4e,
                                        I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /*
 * Insmod parameters
 */
-SENSORS_INSMOD_1(lm83);
+I2C_CLIENT_INSMOD_1(lm83);
 /*
 * The LM83 registers
@@ -138,6 +138,7 @@ static struct i2c_driver lm83_driver = {
 struct lm83_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid; /* zero until following fields are valid */
        unsigned long last_updated; /* in jiffies */
@@ -212,7 +213,7 @@ static int lm83_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, lm83_detect);
+        return i2c_probe(adapter, &addr_data, lm83_detect);
 }
 /*
@@ -312,6 +313,12 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
         */
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev,
                           &sensor_dev_attr_temp1_input.dev_attr);
        device_create_file(&new_client->dev,
@@ -340,6 +347,8 @@ static int lm83_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -348,15 +357,15 @@ exit:
 static int lm83_detach_client(struct i2c_client *client)
 {
+        struct lm83_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev,
-                    "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index b4d7fd418264..ab214df9624b 100644
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -28,15 +28,15 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_6(lm85b, lm85c, adm1027, adt7463, emc6d100, emc6d102);
+I2C_CLIENT_INSMOD_6(lm85b, lm85c, adm1027, adt7463, emc6d100, emc6d102);
 /* The LM85 registers */
@@ -281,15 +281,6 @@ static int ZONE_TO_REG( int zone )
 #define PPR_TO_REG(val,fan) (SENSORS_LIMIT((val)-1,0,3)<<(fan *2))
 #define PPR_FROM_REG(val,fan) ((((val)>>(fan * 2))&0x03)+1)
-/* i2c-vid.h defines vid_from_reg() */
-#define VID_FROM_REG(val,vrm) (vid_from_reg((val),(vrm)))
-/* Unlike some other drivers we DO NOT set initial limits.  Use
- * the config file to set limits.  Some users have reported
- * motherboards shutting down when we set limits in a previous
- * version of the driver.
- */
 /* Chip sampling rates
 *
 * Some sensors are not updated more frequently than once per second
@@ -339,6 +330,7 @@ struct lm85_autofan {
 struct lm85_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore lock;
        enum chips type;
@@ -1019,7 +1011,7 @@ int lm85_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, lm85_detect);
+        return i2c_probe(adapter, &addr_data, lm85_detect);
 }
 int lm85_detect(struct i2c_adapter *adapter, int address,
@@ -1031,11 +1023,6 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
        int err = 0;
        const char *type_name = "";
-        if (i2c_is_isa_adapter(adapter)) {
-                /* This chip has no ISA interface */
-                goto ERROR0 ;
-        };
        if (!i2c_check_functionality(adapter,
                                        I2C_FUNC_SMBUS_BYTE_DATA)) {
                /* We need to be able to do byte I/O */
@@ -1160,12 +1147,18 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
                goto ERROR1;
        /* Set the VRM version */
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
        /* Initialize the LM85 chip */
        lm85_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR2;
+        }
        device_create_file(&new_client->dev, &dev_attr_fan1_input);
        device_create_file(&new_client->dev, &dev_attr_fan2_input);
        device_create_file(&new_client->dev, &dev_attr_fan3_input);
@@ -1235,6 +1228,8 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
        return 0;
        /* Error out and cleanup code */
+    ERROR2:
+        i2c_detach_client(new_client);
    ERROR1:
        kfree(data);
    ERROR0:
@@ -1243,8 +1238,10 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
 int lm85_detach_client(struct i2c_client *client)
 {
+        struct lm85_data *data = i2c_get_clientdata(client);
+        hwmon_device_unregister(data->class_dev);
        i2c_detach_client(client);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 1921ed1af182..dca996de4c33 100644
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -57,8 +57,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 /*
 * Addresses to scan
@@ -66,13 +67,12 @@
 */
 static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /*
 * Insmod parameters
 */
-SENSORS_INSMOD_1(lm87);
+I2C_CLIENT_INSMOD_1(lm87);
 /*
 * The LM87 registers
@@ -175,6 +175,7 @@ static struct i2c_driver lm87_driver = {
 struct lm87_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid; /* zero until following fields are valid */
        unsigned long last_updated; /* In jiffies */
@@ -537,7 +538,7 @@ static int lm87_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, lm87_detect);
+        return i2c_probe(adapter, &addr_data, lm87_detect);
 }
 /*
@@ -608,6 +609,12 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
        data->in_scale[7] = 1875;
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_in1_input);
        device_create_file(&new_client->dev, &dev_attr_in1_min);
        device_create_file(&new_client->dev, &dev_attr_in1_max);
@@ -673,6 +680,8 @@ static int lm87_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -685,7 +694,7 @@ static void lm87_init_client(struct i2c_client *client)
        u8 config;
        data->channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE);
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
        config = lm87_read_value(client, LM87_REG_CONFIG);
        if (!(config & 0x01)) {
@@ -719,15 +728,15 @@ static void lm87_init_client(struct i2c_client *client)
 static int lm87_detach_client(struct i2c_client *client)
 {
+        struct lm87_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
index a67dcadf7cb0..14de05fcd431 100644
--- a/drivers/hwmon/lm90.c
+++ b/drivers/hwmon/lm90.c
@@ -75,8 +75,9 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 /*
 * Addresses to scan
@@ -89,13 +90,12 @@
 */
 static unsigned short normal_i2c[] = { 0x4c, 0x4d, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /*
 * Insmod parameters
 */
-SENSORS_INSMOD_6(lm90, adm1032, lm99, lm86, max6657, adt7461);
+I2C_CLIENT_INSMOD_6(lm90, adm1032, lm99, lm86, max6657, adt7461);
 /*
 * The LM90 registers
@@ -200,6 +200,7 @@ static struct i2c_driver lm90_driver = {
 struct lm90_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid; /* zero until following fields are valid */
        unsigned long last_updated; /* in jiffies */
@@ -352,7 +353,7 @@ static int lm90_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, lm90_detect);
+        return i2c_probe(adapter, &addr_data, lm90_detect);
 }
 /*
@@ -500,6 +501,12 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
        lm90_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev,
                           &sensor_dev_attr_temp1_input.dev_attr);
        device_create_file(&new_client->dev,
@@ -524,6 +531,8 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -547,15 +556,15 @@ static void lm90_init_client(struct i2c_client *client)
 static int lm90_detach_client(struct i2c_client *client)
 {
+        struct lm90_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c
index 215c8e40ffdd..647b7c7cd575 100644
--- a/drivers/hwmon/lm92.c
+++ b/drivers/hwmon/lm92.c
@@ -44,17 +44,16 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 /* The LM92 and MAX6635 have 2 two-state pins for address selection,
   resulting in 4 possible addresses. */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
                                       I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_1(lm92);
+I2C_CLIENT_INSMOD_1(lm92);
 /* The LM92 registers */
 #define LM92_REG_CONFIG                 0x01 /* 8-bit, RW */
@@ -96,6 +95,7 @@ static struct i2c_driver lm92_driver;
 /* Client data (each client gets its own) */
 struct lm92_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid; /* zero until following fields are valid */
        unsigned long last_updated; /* in jiffies */
@@ -359,6 +359,12 @@ static int lm92_detect(struct i2c_adapter *adapter, int address, int kind)
        lm92_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_temp1_input);
        device_create_file(&new_client->dev, &dev_attr_temp1_crit);
        device_create_file(&new_client->dev, &dev_attr_temp1_crit_hyst);
@@ -370,6 +376,8 @@ static int lm92_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -380,20 +388,20 @@ static int lm92_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, lm92_detect);
+        return i2c_probe(adapter, &addr_data, lm92_detect);
 }
 static int lm92_detach_client(struct i2c_client *client)
 {
+        struct lm92_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c
index 3c159f1d49ee..16bf71f3a04d 100644
--- a/drivers/hwmon/max1619.c
+++ b/drivers/hwmon/max1619.c
@@ -31,20 +31,19 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a,
                                        0x29, 0x2a, 0x2b,
                                        0x4c, 0x4d, 0x4e,
                                        I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /*
 * Insmod parameters
 */
-SENSORS_INSMOD_1(max1619);
+I2C_CLIENT_INSMOD_1(max1619);
 /*
 * The MAX1619 registers
@@ -104,6 +103,7 @@ static struct i2c_driver max1619_driver = {
 struct max1619_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid; /* zero until following fields are valid */
        unsigned long last_updated; /* in jiffies */
@@ -179,7 +179,7 @@ static int max1619_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, max1619_detect);
+        return i2c_probe(adapter, &addr_data, max1619_detect);
 }
 /*
@@ -275,6 +275,12 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
        max1619_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_temp1_input);
        device_create_file(&new_client->dev, &dev_attr_temp2_input);
        device_create_file(&new_client->dev, &dev_attr_temp2_min);
@@ -285,6 +291,8 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -308,15 +316,15 @@ static void max1619_init_client(struct i2c_client *client)
 static int max1619_detach_client(struct i2c_client *client)
 {
+        struct max1619_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index fa4032d53b79..cf2a35799c7c 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -38,23 +38,19 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
-static struct i2c_force_data forces[] = {{ NULL }};
 static u8 devid;
-static unsigned int extra_isa[3];
+static unsigned short address;
+static unsigned short extra_isa[3];
 static u8 confreg[4];
 enum chips { any_chip, pc87360, pc87363, pc87364, pc87365, pc87366 };
-static struct i2c_address_data addr_data = {
-        .normal_i2c             = normal_i2c,
-        .normal_isa             = normal_isa,
-        .forces                 = forces,
-};
 static int init = 1;
 module_param(init, int, 0);
@@ -186,6 +182,7 @@ static inline u8 PWM_TO_REG(int val, int inv)
 struct pc87360_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore lock;
        struct semaphore update_lock;
        char valid;             /* !=0 if following fields are valid */
@@ -224,8 +221,7 @@ struct pc87360_data {
 * Functions declaration
 */
-static int pc87360_attach_adapter(struct i2c_adapter *adapter);
+static int pc87360_detect(struct i2c_adapter *adapter);
-static int pc87360_detect(struct i2c_adapter *adapter, int address, int kind);
 static int pc87360_detach_client(struct i2c_client *client);
 static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,
@@ -242,8 +238,7 @@ static struct pc87360_data *pc87360_update_device(struct device *dev);
 static struct i2c_driver pc87360_driver = {
        .owner          = THIS_MODULE,
        .name           = "pc87360",
-        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = pc87360_detect,
-        .attach_adapter = pc87360_attach_adapter,
        .detach_client  = pc87360_detach_client,
 };
@@ -251,168 +246,178 @@ static struct i2c_driver pc87360_driver = {
 * Sysfs stuff
 */
-static ssize_t set_fan_min(struct device *dev, const char *buf,
+static ssize_t show_fan_input(struct device *dev, struct device_attribute *devattr, char *buf)
-        size_t count, int nr)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan[attr->index],
+                       FAN_DIV_FROM_REG(data->fan_status[attr->index])));
+}
+static ssize_t show_fan_min(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan_min[attr->index],
+                       FAN_DIV_FROM_REG(data->fan_status[attr->index])));
+}
+static ssize_t show_fan_div(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n",
+                       FAN_DIV_FROM_REG(data->fan_status[attr->index]));
+}
+static ssize_t show_fan_status(struct device *dev, struct device_attribute *devattr, char *buf)
 {
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n",
+                       FAN_STATUS_FROM_REG(data->fan_status[attr->index]));
+}
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
        struct i2c_client *client = to_i2c_client(dev);
        struct pc87360_data *data = i2c_get_clientdata(client);
        long fan_min = simple_strtol(buf, NULL, 10);
        down(&data->update_lock);
-        fan_min = FAN_TO_REG(fan_min, FAN_DIV_FROM_REG(data->fan_status[nr]));
+        fan_min = FAN_TO_REG(fan_min, FAN_DIV_FROM_REG(data->fan_status[attr->index]));
        /* If it wouldn't fit, change clock divisor */
        while (fan_min > 255
-            && (data->fan_status[nr] & 0x60) != 0x60) {
+            && (data->fan_status[attr->index] & 0x60) != 0x60) {
                fan_min >>= 1;
-                data->fan[nr] >>= 1;
+                data->fan[attr->index] >>= 1;
-                data->fan_status[nr] += 0x20;
+                data->fan_status[attr->index] += 0x20;
        }
-        data->fan_min[nr] = fan_min > 255 ? 255 : fan_min;
+        data->fan_min[attr->index] = fan_min > 255 ? 255 : fan_min;
-        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_MIN(nr),
+        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_MIN(attr->index),
-                            data->fan_min[nr]);
+                            data->fan_min[attr->index]);
        /* Write new divider, preserve alarm bits */
-        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_STATUS(nr),
+        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_FAN_STATUS(attr->index),
-                            data->fan_status[nr] & 0xF9);
+                            data->fan_status[attr->index] & 0xF9);
        up(&data->update_lock);
        return count;
 }
 #define show_and_set_fan(offset) \
-static ssize_t show_fan##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, \
-{ \
+        show_fan_input, NULL, offset-1); \
-        struct pc87360_data *data = pc87360_update_device(dev); \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IWUSR | S_IRUGO, \
-        return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan[offset-1], \
+        show_fan_min, set_fan_min, offset-1); \
-                       FAN_DIV_FROM_REG(data->fan_status[offset-1]))); \
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO, \
-} \
+        show_fan_div, NULL, offset-1); \
-static ssize_t show_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
+static SENSOR_DEVICE_ATTR(fan##offset##_status, S_IRUGO, \
-{ \
+        show_fan_status, NULL, offset-1);
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan_min[offset-1], \
-                       FAN_DIV_FROM_REG(data->fan_status[offset-1]))); \
-} \
-static ssize_t show_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", \
-                       FAN_DIV_FROM_REG(data->fan_status[offset-1])); \
-} \
-static ssize_t show_fan##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", \
-                       FAN_STATUS_FROM_REG(data->fan_status[offset-1])); \
-} \
-static ssize_t set_fan##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        return set_fan_min(dev, buf, count, offset-1); \
-} \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, \
-        show_fan##offset##_input, NULL); \
-static DEVICE_ATTR(fan##offset##_min, S_IWUSR | S_IRUGO, \
-        show_fan##offset##_min, set_fan##offset##_min); \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO, \
-        show_fan##offset##_div, NULL); \
-static DEVICE_ATTR(fan##offset##_status, S_IRUGO, \
-        show_fan##offset##_status, NULL);
 show_and_set_fan(1)
 show_and_set_fan(2)
 show_and_set_fan(3)
+static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n",
+                       PWM_FROM_REG(data->pwm[attr->index],
+                                    FAN_CONFIG_INVERT(data->fan_conf,
+                                                      attr->index)));
+}
+static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        down(&data->update_lock);
+        data->pwm[attr->index] = PWM_TO_REG(val,
+                              FAN_CONFIG_INVERT(data->fan_conf, attr->index));
+        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_PWM(attr->index),
+                            data->pwm[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
 #define show_and_set_pwm(offset) \
-static ssize_t show_pwm##offset(struct device *dev, struct device_attribute *attr, char *buf) \
+static SENSOR_DEVICE_ATTR(pwm##offset, S_IWUSR | S_IRUGO, \
-{ \
+        show_pwm, set_pwm, offset-1);
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", \
-                       PWM_FROM_REG(data->pwm[offset-1], \
-                                    FAN_CONFIG_INVERT(data->fan_conf, \
-                                                      offset-1))); \
-} \
-static ssize_t set_pwm##offset(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->pwm[offset-1] = PWM_TO_REG(val, \
-                              FAN_CONFIG_INVERT(data->fan_conf, offset-1)); \
-        pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_PWM(offset-1), \
-                            data->pwm[offset-1]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static DEVICE_ATTR(pwm##offset, S_IWUSR | S_IRUGO, \
-        show_pwm##offset, set_pwm##offset);
 show_and_set_pwm(1)
 show_and_set_pwm(2)
 show_and_set_pwm(3)
+static ssize_t show_in_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_in_min(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_in_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_in_status(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", data->in_status[attr->index]);
+}
+static ssize_t set_in_min(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        down(&data->update_lock);
+        data->in_min[attr->index] = IN_TO_REG(val, data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_IN_MIN,
+                            data->in_min[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_in_max(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        down(&data->update_lock);
+        data->in_max[attr->index] = IN_TO_REG(val,
+                               data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_IN_MAX,
+                            data->in_max[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
 #define show_and_set_in(offset) \
-static ssize_t show_in##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, \
-{ \
+        show_in_input, NULL, offset); \
-        struct pc87360_data *data = pc87360_update_device(dev); \
+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IWUSR | S_IRUGO, \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset], \
+        show_in_min, set_in_min, offset); \
-                       data->in_vref)); \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IWUSR | S_IRUGO, \
-} \
+        show_in_max, set_in_max, offset); \
-static ssize_t show_in##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
+static SENSOR_DEVICE_ATTR(in##offset##_status, S_IRUGO, \
-{ \
+        show_in_status, NULL, offset);
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset], \
-                       data->in_vref)); \
-} \
-static ssize_t show_in##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset], \
-                       data->in_vref)); \
-} \
-static ssize_t show_in##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", data->in_status[offset]); \
-} \
-static ssize_t set_in##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_min[offset] = IN_TO_REG(val, data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset, PC87365_REG_IN_MIN, \
-                            data->in_min[offset]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_in##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_max[offset] = IN_TO_REG(val, \
-                               data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset, PC87365_REG_IN_MAX, \
-                            data->in_max[offset]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO, \
-        show_in##offset##_input, NULL); \
-static DEVICE_ATTR(in##offset##_min, S_IWUSR | S_IRUGO, \
-        show_in##offset##_min, set_in##offset##_min); \
-static DEVICE_ATTR(in##offset##_max, S_IWUSR | S_IRUGO, \
-        show_in##offset##_max, set_in##offset##_max); \
-static DEVICE_ATTR(in##offset##_status, S_IRUGO, \
-        show_in##offset##_status, NULL);
 show_and_set_in(0)
 show_and_set_in(1)
 show_and_set_in(2)
@@ -425,88 +430,97 @@ show_and_set_in(8)
 show_and_set_in(9)
 show_and_set_in(10)
+static ssize_t show_therm_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_therm_min(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_therm_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[attr->index],
+                       data->in_vref));
+}
+static ssize_t show_therm_crit(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_crit[attr->index-11],
+                       data->in_vref));
+}
+static ssize_t show_therm_status(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%u\n", data->in_status[attr->index]);
+}
+static ssize_t set_therm_min(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        down(&data->update_lock);
+        data->in_min[attr->index] = IN_TO_REG(val, data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_MIN,
+                            data->in_min[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_therm_max(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        down(&data->update_lock);
+        data->in_max[attr->index] = IN_TO_REG(val, data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_MAX,
+                            data->in_max[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_therm_crit(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        down(&data->update_lock);
+        data->in_crit[attr->index-11] = IN_TO_REG(val, data->in_vref);
+        pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_CRIT,
+                            data->in_crit[attr->index-11]);
+        up(&data->update_lock);
+        return count;
+}
 #define show_and_set_therm(offset) \
-static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
-{ \
+        show_therm_input, NULL, 11+offset-4); \
-        struct pc87360_data *data = pc87360_update_device(dev); \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in[offset+7], \
+        show_therm_min, set_therm_min, 11+offset-4); \
-                       data->in_vref)); \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
-} \
+        show_therm_max, set_therm_max, 11+offset-4); \
-static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
+static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IWUSR | S_IRUGO, \
-{ \
+        show_therm_crit, set_therm_crit, 11+offset-4); \
-        struct pc87360_data *data = pc87360_update_device(dev); \
+static SENSOR_DEVICE_ATTR(temp##offset##_status, S_IRUGO, \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[offset+7], \
+        show_therm_status, NULL, 11+offset-4);
-                       data->in_vref)); \
-} \
-static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[offset+7], \
-                       data->in_vref)); \
-} \
-static ssize_t show_temp##offset##_crit(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", IN_FROM_REG(data->in_crit[offset-4], \
-                       data->in_vref)); \
-} \
-static ssize_t show_temp##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%u\n", data->in_status[offset+7]); \
-} \
-static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_min[offset+7] = IN_TO_REG(val, data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset+7, PC87365_REG_TEMP_MIN, \
-                            data->in_min[offset+7]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_max[offset+7] = IN_TO_REG(val, data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset+7, PC87365_REG_TEMP_MAX, \
-                            data->in_max[offset+7]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_temp##offset##_crit(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->in_crit[offset-4] = IN_TO_REG(val, data->in_vref); \
-        pc87360_write_value(data, LD_IN, offset+7, PC87365_REG_TEMP_CRIT, \
-                            data->in_crit[offset-4]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
-        show_temp##offset##_input, NULL); \
-static DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_min, set_temp##offset##_min); \
-static DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_max, set_temp##offset##_max); \
-static DEVICE_ATTR(temp##offset##_crit, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_crit, set_temp##offset##_crit); \
-static DEVICE_ATTR(temp##offset##_status, S_IRUGO, \
-        show_temp##offset##_status, NULL);
 show_and_set_therm(4)
 show_and_set_therm(5)
 show_and_set_therm(6)
@@ -539,84 +553,93 @@ static ssize_t show_in_alarms(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR(alarms_in, S_IRUGO, show_in_alarms, NULL);
+static ssize_t show_temp_input(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[attr->index]));
+}
+static ssize_t show_temp_min(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[attr->index]));
+}
+static ssize_t show_temp_max(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[attr->index]));
+}
+static ssize_t show_temp_crit(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[attr->index]));
+}
+static ssize_t show_temp_status(struct device *dev, struct device_attribute *devattr, char *buf)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct pc87360_data *data = pc87360_update_device(dev);
+        return sprintf(buf, "%d\n", data->temp_status[attr->index]);
+}
+static ssize_t set_temp_min(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        down(&data->update_lock);
+        data->temp_min[attr->index] = TEMP_TO_REG(val);
+        pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_MIN,
+                            data->temp_min[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_temp_max(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        down(&data->update_lock);
+        data->temp_max[attr->index] = TEMP_TO_REG(val);
+        pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_MAX,
+                            data->temp_max[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
+static ssize_t set_temp_crit(struct device *dev, struct device_attribute *devattr, const char *buf,
+        size_t count)
+{
+        struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+        struct i2c_client *client = to_i2c_client(dev);
+        struct pc87360_data *data = i2c_get_clientdata(client);
+        long val = simple_strtol(buf, NULL, 10);
+        down(&data->update_lock);
+        data->temp_crit[attr->index] = TEMP_TO_REG(val);
+        pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_CRIT,
+                            data->temp_crit[attr->index]);
+        up(&data->update_lock);
+        return count;
+}
 #define show_and_set_temp(offset) \
-static ssize_t show_temp##offset##_input(struct device *dev, struct device_attribute *attr, char *buf) \
+static SENSOR_DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
-{ \
+        show_temp_input, NULL, offset-1); \
-        struct pc87360_data *data = pc87360_update_device(dev); \
+static SENSOR_DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[offset-1])); \
+        show_temp_min, set_temp_min, offset-1); \
-} \
+static SENSOR_DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
-static ssize_t show_temp##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
+        show_temp_max, set_temp_max, offset-1); \
-{ \
+static SENSOR_DEVICE_ATTR(temp##offset##_crit, S_IWUSR | S_IRUGO, \
-        struct pc87360_data *data = pc87360_update_device(dev); \
+        show_temp_crit, set_temp_crit, offset-1); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[offset-1])); \
+static SENSOR_DEVICE_ATTR(temp##offset##_status, S_IRUGO, \
-} \
+        show_temp_status, NULL, offset-1);
-static ssize_t show_temp##offset##_max(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[offset-1])); \
-}\
-static ssize_t show_temp##offset##_crit(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_crit[offset-1])); \
-}\
-static ssize_t show_temp##offset##_status(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        struct pc87360_data *data = pc87360_update_device(dev); \
-        return sprintf(buf, "%d\n", data->temp_status[offset-1]); \
-}\
-static ssize_t set_temp##offset##_min(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->temp_min[offset-1] = TEMP_TO_REG(val); \
-        pc87360_write_value(data, LD_TEMP, offset-1, PC87365_REG_TEMP_MIN, \
-                            data->temp_min[offset-1]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_temp##offset##_max(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->temp_max[offset-1] = TEMP_TO_REG(val); \
-        pc87360_write_value(data, LD_TEMP, offset-1, PC87365_REG_TEMP_MAX, \
-                            data->temp_max[offset-1]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static ssize_t set_temp##offset##_crit(struct device *dev, struct device_attribute *attr, const char *buf, \
-        size_t count) \
-{ \
-        struct i2c_client *client = to_i2c_client(dev); \
-        struct pc87360_data *data = i2c_get_clientdata(client); \
-        long val = simple_strtol(buf, NULL, 10); \
- \
-        down(&data->update_lock); \
-        data->temp_crit[offset-1] = TEMP_TO_REG(val); \
-        pc87360_write_value(data, LD_TEMP, offset-1, PC87365_REG_TEMP_CRIT, \
-                            data->temp_crit[offset-1]); \
-        up(&data->update_lock); \
-        return count; \
-} \
-static DEVICE_ATTR(temp##offset##_input, S_IRUGO, \
-        show_temp##offset##_input, NULL); \
-static DEVICE_ATTR(temp##offset##_min, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_min, set_temp##offset##_min); \
-static DEVICE_ATTR(temp##offset##_max, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_max, set_temp##offset##_max); \
-static DEVICE_ATTR(temp##offset##_crit, S_IWUSR | S_IRUGO, \
-        show_temp##offset##_crit, set_temp##offset##_crit); \
-static DEVICE_ATTR(temp##offset##_status, S_IRUGO, \
-        show_temp##offset##_status, NULL);
 show_and_set_temp(1)
 show_and_set_temp(2)
 show_and_set_temp(3)
@@ -632,12 +655,7 @@ static DEVICE_ATTR(alarms_temp, S_IRUGO, show_temp_alarms, NULL);
 * Device detection, registration and update
 */
-static int pc87360_attach_adapter(struct i2c_adapter *adapter)
+static int __init pc87360_find(int sioaddr, u8 *devid, unsigned short *addresses)
-{
-        return i2c_detect(adapter, &addr_data, pc87360_detect);
-}
-static int pc87360_find(int sioaddr, u8 *devid, int *address)
 {
        u16 val;
        int i;
@@ -683,7 +701,7 @@ static int pc87360_find(int sioaddr, u8 *devid, int *address)
                        continue;
                }
-                address[i] = val;
+                addresses[i] = val;
                if (i==0) { /* Fans */
                        confreg[0] = superio_inb(sioaddr, 0xF0);
@@ -727,9 +745,7 @@ static int pc87360_find(int sioaddr, u8 *devid, int *address)
        return 0;
 }
-/* We don't really care about the address.
+static int pc87360_detect(struct i2c_adapter *adapter)
-   Read from extra_isa instead. */
-int pc87360_detect(struct i2c_adapter *adapter, int address, int kind)
 {
        int i;
        struct i2c_client *new_client;
@@ -738,9 +754,6 @@ int pc87360_detect(struct i2c_adapter *adapter, int address, int kind)
        const char *name = "pc87360";
        int use_thermistors = 0;
-        if (!i2c_is_isa_adapter(adapter))
-                return -ENODEV;
        if (!(data = kmalloc(sizeof(struct pc87360_data), GFP_KERNEL)))
                return -ENOMEM;
        memset(data, 0x00, sizeof(struct pc87360_data));
@@ -838,51 +851,57 @@ int pc87360_detect(struct i2c_adapter *adapter, int address, int kind)
        }
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
        if (data->innr) {
-                device_create_file(&new_client->dev, &dev_attr_in0_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in0_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in1_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in1_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in2_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in2_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in3_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in3_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in4_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in4_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in5_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in5_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in6_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in6_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in7_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in7_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in8_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in8_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in9_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in9_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in10_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in10_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in0_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in0_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in1_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in1_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in2_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in2_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in3_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in3_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in4_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in4_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in5_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in5_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in6_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in6_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in7_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in7_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in8_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in8_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in9_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in9_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in10_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in10_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in0_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in0_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in1_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in1_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in2_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in2_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in3_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in3_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in4_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in4_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in5_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in5_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in6_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in6_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in7_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in7_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in8_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in8_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in9_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in9_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in10_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in10_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in0_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in0_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in1_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in1_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in2_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in2_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in3_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in3_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in4_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in4_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in5_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in5_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in6_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in6_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in7_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in7_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in8_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in8_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in9_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in9_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_in10_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_in10_status.dev_attr);
                device_create_file(&new_client->dev, &dev_attr_cpu0_vid);
                device_create_file(&new_client->dev, &dev_attr_vrm);
@@ -890,90 +909,92 @@ int pc87360_detect(struct i2c_adapter *adapter, int address, int kind)
        }
        if (data->tempnr) {
-                device_create_file(&new_client->dev, &dev_attr_temp1_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp2_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp1_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp2_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp1_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp2_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp1_crit);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_crit.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp2_crit);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_crit.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp1_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp1_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp2_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp2_status.dev_attr);
                device_create_file(&new_client->dev, &dev_attr_alarms_temp);
        }
        if (data->tempnr == 3) {
-                device_create_file(&new_client->dev, &dev_attr_temp3_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp3_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp3_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp3_crit);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_crit.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp3_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp3_status.dev_attr);
        }
        if (data->innr == 14) {
-                device_create_file(&new_client->dev, &dev_attr_temp4_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp5_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp6_input);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_input.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp4_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp5_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp6_min);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_min.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp4_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp5_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp6_max);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_max.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp4_crit);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_crit.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp5_crit);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_crit.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp6_crit);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_crit.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp4_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp4_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp5_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp5_status.dev_attr);
-                device_create_file(&new_client->dev, &dev_attr_temp6_status);
+                device_create_file(&new_client->dev, &sensor_dev_attr_temp6_status.dev_attr);
        }
        if (data->fannr) {
                if (FAN_CONFIG_MONITOR(data->fan_conf, 0)) {
                        device_create_file(&new_client->dev,
-                                           &dev_attr_fan1_input);
+                                           &sensor_dev_attr_fan1_input.dev_attr);
                        device_create_file(&new_client->dev,
-                                           &dev_attr_fan1_min);
+                                           &sensor_dev_attr_fan1_min.dev_attr);
                        device_create_file(&new_client->dev,
-                                           &dev_attr_fan1_div);
+                                           &sensor_dev_attr_fan1_div.dev_attr);
                        device_create_file(&new_client->dev,
-                                           &dev_attr_fan1_status);
+                                           &sensor_dev_attr_fan1_status.dev_attr);
                }
                if (FAN_CONFIG_MONITOR(data->fan_conf, 1)) {
                        device_create_file(&new_client->dev,
-                                           &dev_attr_fan2_input);
+                                           &sensor_dev_attr_fan2_input.dev_attr);
                        device_create_file(&new_client->dev,
-                                           &dev_attr_fan2_min);
+                                           &sensor_dev_attr_fan2_min.dev_attr);
                        device_create_file(&new_client->dev,
-                                           &dev_attr_fan2_div);
+                                           &sensor_dev_attr_fan2_div.dev_attr);
                        device_create_file(&new_client->dev,
-                                           &dev_attr_fan2_status);
+                                           &sensor_dev_attr_fan2_status.dev_attr);
                }
                if (FAN_CONFIG_CONTROL(data->fan_conf, 0))
-                        device_create_file(&new_client->dev, &dev_attr_pwm1);
+                        device_create_file(&new_client->dev, &sensor_dev_attr_pwm1.dev_attr);
                if (FAN_CONFIG_CONTROL(data->fan_conf, 1))
-                        device_create_file(&new_client->dev, &dev_attr_pwm2);
+                        device_create_file(&new_client->dev, &sensor_dev_attr_pwm2.dev_attr);
        }
        if (data->fannr == 3) {
                if (FAN_CONFIG_MONITOR(data->fan_conf, 2)) {
                        device_create_file(&new_client->dev,
-                                           &dev_attr_fan3_input);
+                                           &sensor_dev_attr_fan3_input.dev_attr);
                        device_create_file(&new_client->dev,
-                                           &dev_attr_fan3_min);
+                                           &sensor_dev_attr_fan3_min.dev_attr);
                        device_create_file(&new_client->dev,
-                                           &dev_attr_fan3_div);
+                                           &sensor_dev_attr_fan3_div.dev_attr);
                        device_create_file(&new_client->dev,
-                                           &dev_attr_fan3_status);
+                                           &sensor_dev_attr_fan3_status.dev_attr);
                }
                if (FAN_CONFIG_CONTROL(data->fan_conf, 2))
-                        device_create_file(&new_client->dev, &dev_attr_pwm3);
+                        device_create_file(&new_client->dev, &sensor_dev_attr_pwm3.dev_attr);
        }
        return 0;
+ERROR3:
+        i2c_detach_client(new_client);
 ERROR2:
        for (i = 0; i < 3; i++) {
                if (data->address[i]) {
@@ -990,11 +1011,10 @@ static int pc87360_detach_client(struct i2c_client *client)
        struct pc87360_data *data = i2c_get_clientdata(client);
        int i;
-        if ((i = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((i = i2c_detach_client(client)))
                return i;
-        }
        for (i = 0; i < 3; i++) {
                if (data->address[i]) {
@@ -1320,23 +1340,23 @@ static int __init pc87360_init(void)
        /* Arbitrarily pick one of the addresses */
        for (i = 0; i < 3; i++) {
                if (extra_isa[i] != 0x0000) {
-                        normal_isa[0] = extra_isa[i];
+                        address = extra_isa[i];
                        break;
                }
        }
-        if (normal_isa[0] == 0x0000) {
+        if (address == 0x0000) {
                printk(KERN_WARNING "pc87360: No active logical device, "
                       "module not inserted.\n");
                return -ENODEV;
        }
-        return i2c_add_driver(&pc87360_driver);
+        return i2c_isa_add_driver(&pc87360_driver);
 }
 static void __exit pc87360_exit(void)
 {
-        i2c_del_driver(&pc87360_driver);
+        i2c_isa_del_driver(&pc87360_driver);
 }
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 6bbfc8fb4f13..8610bce08244 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -55,7 +55,9 @@
 #include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include <asm/io.h>
@@ -68,14 +70,10 @@ module_param(force_addr, ushort, 0);
 MODULE_PARM_DESC(force_addr,
                 "Initialize the base address of the sensors");
-/* Addresses to scan.
+/* Device address
   Note that we can't determine the ISA address until we have initialized
   our module */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
+static unsigned short address;
-static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
-/* Insmod parameters */
-SENSORS_INSMOD_1(sis5595);
 /* Many SIS5595 constants specified below */
@@ -168,6 +166,7 @@ static inline u8 DIV_TO_REG(int val)
   allocated. */
 struct sis5595_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore lock;
        struct semaphore update_lock;
@@ -190,8 +189,7 @@ struct sis5595_data {
 static struct pci_dev *s_bridge;        /* pointer to the (only) sis5595 */
-static int sis5595_attach_adapter(struct i2c_adapter *adapter);
+static int sis5595_detect(struct i2c_adapter *adapter);
-static int sis5595_detect(struct i2c_adapter *adapter, int address, int kind);
 static int sis5595_detach_client(struct i2c_client *client);
 static int sis5595_read_value(struct i2c_client *client, u8 register);
@@ -202,9 +200,7 @@ static void sis5595_init_client(struct i2c_client *client);
 static struct i2c_driver sis5595_driver = {
        .owner          = THIS_MODULE,
        .name           = "sis5595",
-        .id             = I2C_DRIVERID_SIS5595,
+        .attach_adapter = sis5595_detect,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = sis5595_attach_adapter,
        .detach_client  = sis5595_detach_client,
 };
@@ -476,14 +472,7 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, ch
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 /* This is called when the module is loaded */
-static int sis5595_attach_adapter(struct i2c_adapter *adapter)
+static int sis5595_detect(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, sis5595_detect);
-}
-int sis5595_detect(struct i2c_adapter *adapter, int address, int kind)
 {
        int err = 0;
        int i;
@@ -492,10 +481,6 @@ int sis5595_detect(struct i2c_adapter *adapter, int address, int kind)
        char val;
        u16 a;
-        /* Make sure we are probing the ISA bus!!  */
-        if (!i2c_is_isa_adapter(adapter))
-                goto exit;
        if (force_addr)
                address = force_addr & ~(SIS5595_EXTENT - 1);
        /* Reserve the ISA region */
@@ -578,6 +563,12 @@ int sis5595_detect(struct i2c_adapter *adapter, int address, int kind)
        }
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_in0_input);
        device_create_file(&new_client->dev, &dev_attr_in0_min);
        device_create_file(&new_client->dev, &dev_attr_in0_max);
@@ -608,7 +599,9 @@ int sis5595_detect(struct i2c_adapter *adapter, int address, int kind)
                device_create_file(&new_client->dev, &dev_attr_temp1_max_hyst);
        }
        return 0;
-        
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit_release:
@@ -619,18 +612,17 @@ exit:
 static int sis5595_detach_client(struct i2c_client *client)
 {
+        struct sis5595_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev,
-                    "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        if (i2c_is_isa_client(client))
+        release_region(client->addr, SIS5595_EXTENT);
-                release_region(client->addr, SIS5595_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
@@ -745,7 +737,6 @@ static int __devinit sis5595_pci_probe(struct pci_dev *dev,
 {
        u16 val;
        int *i;
-        int addr = 0;
        for (i = blacklist; *i != 0; i++) {
                struct pci_dev *dev;
@@ -761,22 +752,19 @@ static int __devinit sis5595_pci_probe(struct pci_dev *dev,
            pci_read_config_word(dev, SIS5595_BASE_REG, &val))
                return -ENODEV;
        
-        addr = val & ~(SIS5595_EXTENT - 1);
+        address = val & ~(SIS5595_EXTENT - 1);
-        if (addr == 0 && force_addr == 0) {
+        if (address == 0 && force_addr == 0) {
                dev_err(&dev->dev, "Base address not set - upgrade BIOS or use force_addr=0xaddr\n");
                return -ENODEV;
        }
-        if (force_addr)
-                addr = force_addr;      /* so detect will get called */
-        if (!addr) {
+        if (!address) {
                dev_err(&dev->dev,"No SiS 5595 sensors found.\n");
                return -ENODEV;
        }
-        normal_isa[0] = addr;
        s_bridge = pci_dev_get(dev);
-        if (i2c_add_driver(&sis5595_driver)) {
+        if (i2c_isa_add_driver(&sis5595_driver)) {
                pci_dev_put(s_bridge);
                s_bridge = NULL;
        }
@@ -803,7 +791,7 @@ static void __exit sm_sis5595_exit(void)
 {
        pci_unregister_driver(&sis5595_pci_driver);
        if (s_bridge != NULL) {
-                i2c_del_driver(&sis5595_driver);
+                i2c_isa_del_driver(&sis5595_driver);
                pci_dev_put(s_bridge);
                s_bridge = NULL;
        }
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index fdeeb3ab6f2f..7fe71576dea4 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -31,23 +31,14 @@
 #include <linux/ioport.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <asm/io.h>
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
 /* Address is autodetected, there is no default value */
-static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
+static unsigned short address;
-static struct i2c_force_data forces[] = {{NULL}};
-enum chips { any_chip, smsc47b397 };
-static struct i2c_address_data addr_data = {
-        .normal_i2c             = normal_i2c,
-        .normal_isa             = normal_isa,
-        .probe                  = normal_i2c,           /* cheat */
-        .ignore                 = normal_i2c,           /* cheat */
-        .forces                 = forces,
-};
 /* Super-I/0 registers and commands */
@@ -100,6 +91,7 @@ static u8 smsc47b397_reg_temp[] = {0x25, 0x26, 0x27, 0x80};
 struct smsc47b397_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore lock;
        struct semaphore update_lock;
@@ -215,52 +207,40 @@ sysfs_fan(4);
 #define device_create_file_fan(client, num) \
        device_create_file(&client->dev, &dev_attr_fan##num##_input)
-static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind);
-static int smsc47b397_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, smsc47b397_detect);
-}
 static int smsc47b397_detach_client(struct i2c_client *client)
 {
+        struct smsc47b397_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
        release_region(client->addr, SMSC_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
+static int smsc47b397_detect(struct i2c_adapter *adapter);
 static struct i2c_driver smsc47b397_driver = {
        .owner          = THIS_MODULE,
        .name           = "smsc47b397",
-        .id             = I2C_DRIVERID_SMSC47B397,
+        .attach_adapter = smsc47b397_detect,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = smsc47b397_attach_adapter,
        .detach_client  = smsc47b397_detach_client,
 };
-static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind)
+static int smsc47b397_detect(struct i2c_adapter *adapter)
 {
        struct i2c_client *new_client;
        struct smsc47b397_data *data;
        int err = 0;
-        if (!i2c_is_isa_adapter(adapter)) {
+        if (!request_region(address, SMSC_EXTENT, smsc47b397_driver.name)) {
-                return 0;
+                dev_err(&adapter->dev, "Region 0x%x already in use!\n",
-        }
+                        address);
-        if (!request_region(addr, SMSC_EXTENT, smsc47b397_driver.name)) {
-                dev_err(&adapter->dev, "Region 0x%x already in use!\n", addr);
                return -EBUSY;
        }
@@ -272,7 +252,7 @@ static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind)
        new_client = &data->client;
        i2c_set_clientdata(new_client, data);
-        new_client->addr = addr;
+        new_client->addr = address;
        init_MUTEX(&data->lock);
        new_client->adapter = adapter;
        new_client->driver = &smsc47b397_driver;
@@ -285,6 +265,12 @@ static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind)
        if ((err = i2c_attach_client(new_client)))
                goto error_free;
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error_detach;
+        }
        device_create_file_temp(new_client, 1);
        device_create_file_temp(new_client, 2);
        device_create_file_temp(new_client, 3);
@@ -297,14 +283,16 @@ static int smsc47b397_detect(struct i2c_adapter *adapter, int addr, int kind)
        return 0;
+error_detach:
+        i2c_detach_client(new_client);
 error_free:
        kfree(data);
 error_release:
-        release_region(addr, SMSC_EXTENT);
+        release_region(address, SMSC_EXTENT);
        return err;
 }
-static int __init smsc47b397_find(unsigned int *addr)
+static int __init smsc47b397_find(unsigned short *addr)
 {
        u8 id, rev;
@@ -333,15 +321,15 @@ static int __init smsc47b397_init(void)
 {
        int ret;
-        if ((ret = smsc47b397_find(normal_isa)))
+        if ((ret = smsc47b397_find(&address)))
                return ret;
-        return i2c_add_driver(&smsc47b397_driver);
+        return i2c_isa_add_driver(&smsc47b397_driver);
 }
 static void __exit smsc47b397_exit(void)
 {
-        i2c_del_driver(&smsc47b397_driver);
+        i2c_isa_del_driver(&smsc47b397_driver);
 }
 MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 7166ad0b2fda..7e699a8ede26 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -30,21 +30,14 @@
 #include <linux/ioport.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <asm/io.h>
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
 /* Address is autodetected, there is no default value */
-static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
+static unsigned short address;
-static struct i2c_force_data forces[] = {{NULL}};
-enum chips { any_chip, smsc47m1 };
-static struct i2c_address_data addr_data = {
-        .normal_i2c             = normal_i2c,
-        .normal_isa             = normal_isa,
-        .forces                 = forces,
-};
 /* Super-I/0 registers and commands */
@@ -108,6 +101,7 @@ superio_exit(void)
 struct smsc47m1_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore lock;
        struct semaphore update_lock;
@@ -121,9 +115,7 @@ struct smsc47m1_data {
 };
-static int smsc47m1_attach_adapter(struct i2c_adapter *adapter);
+static int smsc47m1_detect(struct i2c_adapter *adapter);
-static int smsc47m1_find(int *address);
-static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind);
 static int smsc47m1_detach_client(struct i2c_client *client);
 static int smsc47m1_read_value(struct i2c_client *client, u8 reg);
@@ -136,9 +128,7 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
 static struct i2c_driver smsc47m1_driver = {
        .owner          = THIS_MODULE,
        .name           = "smsc47m1",
-        .id             = I2C_DRIVERID_SMSC47M1,
+        .attach_adapter = smsc47m1_detect,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = smsc47m1_attach_adapter,
        .detach_client  = smsc47m1_detach_client,
 };
@@ -354,14 +344,7 @@ fan_present(2);
 static DEVICE_ATTR(alarms, S_IRUGO, get_alarms, NULL);
-static int smsc47m1_attach_adapter(struct i2c_adapter *adapter)
+static int __init smsc47m1_find(unsigned short *addr)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, smsc47m1_detect);
-}
-static int smsc47m1_find(int *address)
 {
        u8 val;
@@ -388,10 +371,10 @@ static int smsc47m1_find(int *address)
        }
        superio_select();
-        *address = (superio_inb(SUPERIO_REG_BASE) << 8)
+        *addr = (superio_inb(SUPERIO_REG_BASE) << 8)
-                 |  superio_inb(SUPERIO_REG_BASE + 1);
+              |  superio_inb(SUPERIO_REG_BASE + 1);
        val = superio_inb(SUPERIO_REG_ACT);
-        if (*address == 0 || (val & 0x01) == 0) {
+        if (*addr == 0 || (val & 0x01) == 0) {
                printk(KERN_INFO "smsc47m1: Device is disabled, will not use\n");
                superio_exit();
                return -ENODEV;
@@ -401,17 +384,13 @@ static int smsc47m1_find(int *address)
        return 0;
 }
-static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
+static int smsc47m1_detect(struct i2c_adapter *adapter)
 {
        struct i2c_client *new_client;
        struct smsc47m1_data *data;
        int err = 0;
        int fan1, fan2, pwm1, pwm2;
-        if (!i2c_is_isa_adapter(adapter)) {
-                return 0;
-        }
        if (!request_region(address, SMSC_EXTENT, smsc47m1_driver.name)) {
                dev_err(&adapter->dev, "Region 0x%x already in use!\n", address);
                return -EBUSY;
@@ -461,6 +440,13 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
           function. */
        smsc47m1_update_device(&new_client->dev, 1);
+        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto error_detach;
+        }
        if (fan1) {
                device_create_file(&new_client->dev, &dev_attr_fan1_input);
                device_create_file(&new_client->dev, &dev_attr_fan1_min);
@@ -494,6 +480,8 @@ static int smsc47m1_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+error_detach:
+        i2c_detach_client(new_client);
 error_free:
        kfree(data);
 error_release:
@@ -503,16 +491,16 @@ error_release:
 static int smsc47m1_detach_client(struct i2c_client *client)
 {
+        struct smsc47m1_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
        release_region(client->addr, SMSC_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
@@ -573,16 +561,16 @@ static struct smsc47m1_data *smsc47m1_update_device(struct device *dev,
 static int __init sm_smsc47m1_init(void)
 {
-        if (smsc47m1_find(normal_isa)) {
+        if (smsc47m1_find(&address)) {
                return -ENODEV;
        }
-        return i2c_add_driver(&smsc47m1_driver);
+        return i2c_isa_add_driver(&smsc47m1_driver);
 }
 static void __exit sm_smsc47m1_exit(void)
 {
-        i2c_del_driver(&smsc47m1_driver);
+        i2c_isa_del_driver(&smsc47m1_driver);
 }
 MODULE_AUTHOR("Mark D. Studebaker <mdsxyz123@yahoo.com>");
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 164d47948390..eb84997627c8 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -35,7 +35,9 @@
 #include <linux/pci.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <asm/io.h>
@@ -47,14 +49,10 @@ module_param(force_addr, ushort, 0);
 MODULE_PARM_DESC(force_addr,
                 "Initialize the base address of the sensors");
-/* Addresses to scan.
+/* Device address
   Note that we can't determine the ISA address until we have initialized
   our module */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
+static unsigned short address;
-static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
-/* Insmod parameters */
-SENSORS_INSMOD_1(via686a);
 /*
   The Via 686a southbridge has a LM78-like chip integrated on the same IC.
@@ -297,6 +295,7 @@ static inline long TEMP_FROM_REG10(u16 val)
   via686a client is allocated. */
 struct via686a_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid;             /* !=0 if following fields are valid */
        unsigned long last_updated;     /* In jiffies */
@@ -315,8 +314,7 @@ struct via686a_data {
 static struct pci_dev *s_bridge;        /* pointer to the (only) via686a */
-static int via686a_attach_adapter(struct i2c_adapter *adapter);
+static int via686a_detect(struct i2c_adapter *adapter);
-static int via686a_detect(struct i2c_adapter *adapter, int address, int kind);
 static int via686a_detach_client(struct i2c_client *client);
 static inline int via686a_read_value(struct i2c_client *client, u8 reg)
@@ -576,22 +574,13 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 static struct i2c_driver via686a_driver = {
        .owner          = THIS_MODULE,
        .name           = "via686a",
-        .id             = I2C_DRIVERID_VIA686A,
+        .attach_adapter = via686a_detect,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = via686a_attach_adapter,
        .detach_client  = via686a_detach_client,
 };
 /* This is called when the module is loaded */
-static int via686a_attach_adapter(struct i2c_adapter *adapter)
+static int via686a_detect(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, via686a_detect);
-}
-static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
 {
        struct i2c_client *new_client;
        struct via686a_data *data;
@@ -599,13 +588,6 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
        const char client_name[] = "via686a";
        u16 val;
-        /* Make sure we are probing the ISA bus!!  */
-        if (!i2c_is_isa_adapter(adapter)) {
-                dev_err(&adapter->dev,
-                "via686a_detect called for an I2C bus adapter?!?\n");
-                return 0;
-        }
        /* 8231 requires multiple of 256, we enforce that on 686 as well */
        if (force_addr)
                address = force_addr & 0xFF00;
@@ -637,7 +619,7 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
        if (!(data = kmalloc(sizeof(struct via686a_data), GFP_KERNEL))) {
                err = -ENOMEM;
-                goto ERROR0;
+                goto exit_release;
        }
        memset(data, 0, sizeof(struct via686a_data));
@@ -655,12 +637,18 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
        init_MUTEX(&data->update_lock);
        /* Tell the I2C layer a new client has arrived */
        if ((err = i2c_attach_client(new_client)))
-                goto ERROR3;
+                goto exit_free;
        /* Initialize the VIA686A chip */
        via686a_init_client(new_client);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_in0_input);
        device_create_file(&new_client->dev, &dev_attr_in1_input);
        device_create_file(&new_client->dev, &dev_attr_in2_input);
@@ -695,25 +683,27 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
-ERROR3:
+exit_detach:
+        i2c_detach_client(new_client);
+exit_free:
        kfree(data);
-ERROR0:
+exit_release:
        release_region(address, VIA686A_EXTENT);
        return err;
 }
 static int via686a_detach_client(struct i2c_client *client)
 {
+        struct via686a_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev,
-                "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
        release_region(client->addr, VIA686A_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
@@ -810,29 +800,25 @@ static int __devinit via686a_pci_probe(struct pci_dev *dev,
                                       const struct pci_device_id *id)
 {
        u16 val;
-        int addr = 0;
        if (PCIBIOS_SUCCESSFUL !=
            pci_read_config_word(dev, VIA686A_BASE_REG, &val))
                return -ENODEV;
-        addr = val & ~(VIA686A_EXTENT - 1);
+        address = val & ~(VIA686A_EXTENT - 1);
-        if (addr == 0 && force_addr == 0) {
+        if (address == 0 && force_addr == 0) {
                dev_err(&dev->dev, "base address not set - upgrade BIOS "
                        "or use force_addr=0xaddr\n");
                return -ENODEV;
        }
-        if (force_addr)
-                addr = force_addr;      /* so detect will get called */
-        if (!addr) {
+        if (!address) {
                dev_err(&dev->dev, "No Via 686A sensors found.\n");
                return -ENODEV;
        }
-        normal_isa[0] = addr;
        s_bridge = pci_dev_get(dev);
-        if (i2c_add_driver(&via686a_driver)) {
+        if (i2c_isa_add_driver(&via686a_driver)) {
                pci_dev_put(s_bridge);
                s_bridge = NULL;
        }
@@ -859,7 +845,7 @@ static void __exit sm_via686a_exit(void)
 {
        pci_unregister_driver(&via686a_pci_driver);
        if (s_bridge != NULL) {
-                i2c_del_driver(&via686a_driver);
+                i2c_isa_del_driver(&via686a_driver);
                pci_dev_put(s_bridge);
                s_bridge = NULL;
        }
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 8a40b6976e1a..b60efe8f8b26 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -9,6 +9,9 @@
    Thanks to Leon Moonen, Steve Cliffe and Grant Coady for their help
    in testing and debugging this driver.
+    This driver also supports the W83627EHG, which is the lead-free
+    version of the W83627EHF.
    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
@@ -37,17 +40,14 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 #include <asm/io.h>
 #include "lm75.h"
-/* Addresses to scan
+/* The actual ISA address is read from Super-I/O configuration space */
-   The actual ISA address is read from Super-I/O configuration space */
+static unsigned short address;
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
-/* Insmod parameters */
-SENSORS_INSMOD_1(w83627ehf);
 /*
 * Super-I/O constants and functions
@@ -174,6 +174,7 @@ temp1_to_reg(int temp)
 struct w83627ehf_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore lock;
        struct semaphore update_lock;
@@ -666,15 +667,12 @@ static void w83627ehf_init_client(struct i2c_client *client)
        }
 }
-static int w83627ehf_detect(struct i2c_adapter *adapter, int address, int kind)
+static int w83627ehf_detect(struct i2c_adapter *adapter)
 {
        struct i2c_client *client;
        struct w83627ehf_data *data;
        int i, err = 0;
-        if (!i2c_is_isa_adapter(adapter))
-                return 0;
        if (!request_region(address, REGION_LENGTH, w83627ehf_driver.name)) {
                err = -EBUSY;
                goto exit;
@@ -720,6 +718,12 @@ static int w83627ehf_detect(struct i2c_adapter *adapter, int address, int kind)
                data->has_fan |= (1 << 4);
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&client->dev, &dev_attr_fan1_input);
        device_create_file(&client->dev, &dev_attr_fan1_min);
        device_create_file(&client->dev, &dev_attr_fan1_div);
@@ -753,6 +757,8 @@ static int w83627ehf_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+exit_detach:
+        i2c_detach_client(client);
 exit_free:
        kfree(data);
 exit_release:
@@ -761,24 +767,17 @@ exit:
        return err;
 }
-static int w83627ehf_attach_adapter(struct i2c_adapter *adapter)
-{
-        if (!(adapter->class & I2C_CLASS_HWMON))
-                return 0;
-        return i2c_detect(adapter, &addr_data, w83627ehf_detect);
-}
 static int w83627ehf_detach_client(struct i2c_client *client)
 {
+        struct w83627ehf_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
        release_region(client->addr, REGION_LENGTH);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
@@ -786,12 +785,11 @@ static int w83627ehf_detach_client(struct i2c_client *client)
 static struct i2c_driver w83627ehf_driver = {
        .owner          = THIS_MODULE,
        .name           = "w83627ehf",
-        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = w83627ehf_detect,
-        .attach_adapter = w83627ehf_attach_adapter,
        .detach_client  = w83627ehf_detach_client,
 };
-static int __init w83627ehf_find(int sioaddr, int *address)
+static int __init w83627ehf_find(int sioaddr, unsigned short *addr)
 {
        u16 val;
@@ -809,8 +807,8 @@ static int __init w83627ehf_find(int sioaddr, int *address)
        superio_select(W83627EHF_LD_HWM);
        val = (superio_inb(SIO_REG_ADDR) << 8)
            | superio_inb(SIO_REG_ADDR + 1);
-        *address = val & ~(REGION_LENGTH - 1);
+        *addr = val & ~(REGION_LENGTH - 1);
-        if (*address == 0) {
+        if (*addr == 0) {
                superio_exit();
                return -ENODEV;
        }
@@ -826,16 +824,16 @@ static int __init w83627ehf_find(int sioaddr, int *address)
 static int __init sensors_w83627ehf_init(void)
 {
-        if (w83627ehf_find(0x2e, &normal_isa[0])
+        if (w83627ehf_find(0x2e, &address)
-         && w83627ehf_find(0x4e, &normal_isa[0]))
+         && w83627ehf_find(0x4e, &address))
                return -ENODEV;
-        return i2c_add_driver(&w83627ehf_driver);
+        return i2c_isa_add_driver(&w83627ehf_driver);
 }
 static void __exit sensors_w83627ehf_exit(void)
 {
-        i2c_del_driver(&w83627ehf_driver);
+        i2c_isa_del_driver(&w83627ehf_driver);
 }
 MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index bd87a42e068a..02bd5c0239a2 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -42,8 +42,10 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 #include "lm75.h"
@@ -56,12 +58,11 @@ module_param(force_i2c, byte, 0);
 MODULE_PARM_DESC(force_i2c,
                 "Initialize the i2c address of the sensors");
-/* Addresses to scan */
+/* The actual ISA address is read from Super-I/O configuration space */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
+static unsigned short address;
-static unsigned int normal_isa[] = { 0, I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_4(w83627hf, w83627thf, w83697hf, w83637hf);
+enum chips { any_chip, w83627hf, w83627thf, w83697hf, w83637hf };
 static int init = 1;
 module_param(init, bool, 0);
@@ -277,6 +278,7 @@ static inline u8 DIV_TO_REG(long val)
   dynamically allocated, at the same time when a new client is allocated. */
 struct w83627hf_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore lock;
        enum chips type;
@@ -314,9 +316,7 @@ struct w83627hf_data {
 };
-static int w83627hf_attach_adapter(struct i2c_adapter *adapter);
+static int w83627hf_detect(struct i2c_adapter *adapter);
-static int w83627hf_detect(struct i2c_adapter *adapter, int address,
-                          int kind);
 static int w83627hf_detach_client(struct i2c_client *client);
 static int w83627hf_read_value(struct i2c_client *client, u16 register);
@@ -328,9 +328,7 @@ static void w83627hf_init_client(struct i2c_client *client);
 static struct i2c_driver w83627hf_driver = {
        .owner          = THIS_MODULE,
        .name           = "w83627hf",
-        .id             = I2C_DRIVERID_W83627HF,
+        .attach_adapter = w83627hf_detect,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = w83627hf_attach_adapter,
        .detach_client  = w83627hf_detach_client,
 };
@@ -959,16 +957,7 @@ device_create_file(&client->dev, &dev_attr_temp##offset##_type); \
 } while (0)
-/* This function is called when:
+static int __init w83627hf_find(int sioaddr, unsigned short *addr)
-     * w83627hf_driver is inserted (when this module is loaded), for each
-       available adapter
-     * when a new adapter is inserted (and w83627hf_driver is still present) */
-static int w83627hf_attach_adapter(struct i2c_adapter *adapter)
-{
-        return i2c_detect(adapter, &addr_data, w83627hf_detect);
-}
-static int w83627hf_find(int sioaddr, int *address)
 {
        u16 val;
@@ -988,32 +977,24 @@ static int w83627hf_find(int sioaddr, int *address)
        superio_select(W83627HF_LD_HWM);
        val = (superio_inb(WINB_BASE_REG) << 8) |
               superio_inb(WINB_BASE_REG + 1);
-        *address = val & ~(WINB_EXTENT - 1);
+        *addr = val & ~(WINB_EXTENT - 1);
-        if (*address == 0 && force_addr == 0) {
+        if (*addr == 0 && force_addr == 0) {
                superio_exit();
                return -ENODEV;
        }
-        if (force_addr)
-                *address = force_addr;  /* so detect will get called */
        superio_exit();
        return 0;
 }
-int w83627hf_detect(struct i2c_adapter *adapter, int address,
+static int w83627hf_detect(struct i2c_adapter *adapter)
-                   int kind)
 {
-        int val;
+        int val, kind;
        struct i2c_client *new_client;
        struct w83627hf_data *data;
        int err = 0;
        const char *client_name = "";
-        if (!i2c_is_isa_adapter(adapter)) {
-                err = -ENODEV;
-                goto ERROR0;
-        }
        if(force_addr)
                address = force_addr & ~(WINB_EXTENT - 1);
@@ -1102,6 +1083,12 @@ int w83627hf_detect(struct i2c_adapter *adapter, int address,
        data->fan_min[2] = w83627hf_read_value(new_client, W83781D_REG_FAN_MIN(3));
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
        device_create_file_in(new_client, 0);
        if (kind != w83697hf)
                device_create_file_in(new_client, 1);
@@ -1152,6 +1139,8 @@ int w83627hf_detect(struct i2c_adapter *adapter, int address,
        return 0;
+      ERROR3:
+        i2c_detach_client(new_client);
      ERROR2:
        kfree(data);
      ERROR1:
@@ -1162,16 +1151,16 @@ int w83627hf_detect(struct i2c_adapter *adapter, int address,
 static int w83627hf_detach_client(struct i2c_client *client)
 {
+        struct w83627hf_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev,
-                       "Client deregistration failed, client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
        release_region(client->addr, WINB_EXTENT);
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
@@ -1327,7 +1316,7 @@ static void w83627hf_init_client(struct i2c_client *client)
                data->vrm = (data->vrm_ovt & 0x01) ? 90 : 82;
        } else {
                /* Convert VID to voltage based on default VRM */
-                data->vrm = i2c_which_vrm();
+                data->vrm = vid_which_vrm();
        }
        tmp = w83627hf_read_value(client, W83781D_REG_SCFG1);
@@ -1485,20 +1474,17 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev)
 static int __init sensors_w83627hf_init(void)
 {
-        int addr;
+        if (w83627hf_find(0x2e, &address)
+         && w83627hf_find(0x4e, &address)) {
-        if (w83627hf_find(0x2e, &addr)
-         && w83627hf_find(0x4e, &addr)) {
                return -ENODEV;
        }
-        normal_isa[0] = addr;
-        return i2c_add_driver(&w83627hf_driver);
+        return i2c_isa_add_driver(&w83627hf_driver);
 }
 static void __exit sensors_w83627hf_exit(void)
 {
-        i2c_del_driver(&w83627hf_driver);
+        i2c_isa_del_driver(&w83627hf_driver);
 }
 MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, "
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 0bb131ce09eb..4c43337ca780 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -38,8 +38,10 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/i2c-isa.h>
-#include <linux/i2c-vid.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-vid.h>
+#include <linux/err.h>
 #include <asm/io.h>
 #include "lm75.h"
@@ -47,10 +49,10 @@
 static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
                                        0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
                                        0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { 0x0290, I2C_CLIENT_ISA_END };
+static unsigned short isa_address = 0x290;
 /* Insmod parameters */
-SENSORS_INSMOD_5(w83781d, w83782d, w83783s, w83627hf, as99127f);
+I2C_CLIENT_INSMOD_5(w83781d, w83782d, w83783s, w83627hf, as99127f);
 I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
                    "{bus, clientaddr, subclientaddr1, subclientaddr2}");
@@ -218,6 +220,7 @@ DIV_TO_REG(long val, enum chips type)
   allocated. */
 struct w83781d_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore lock;
        enum chips type;
@@ -255,6 +258,7 @@ struct w83781d_data {
 };
 static int w83781d_attach_adapter(struct i2c_adapter *adapter);
+static int w83781d_isa_attach_adapter(struct i2c_adapter *adapter);
 static int w83781d_detect(struct i2c_adapter *adapter, int address, int kind);
 static int w83781d_detach_client(struct i2c_client *client);
@@ -273,6 +277,14 @@ static struct i2c_driver w83781d_driver = {
        .detach_client = w83781d_detach_client,
 };
+static struct i2c_driver w83781d_isa_driver = {
+        .owner = THIS_MODULE,
+        .name = "w83781d-isa",
+        .attach_adapter = w83781d_isa_attach_adapter,
+        .detach_client = w83781d_detach_client,
+};
 /* following are the sysfs callback functions */
 #define show_in_reg(reg) \
 static ssize_t show_##reg (struct device *dev, char *buf, int nr) \
@@ -856,7 +868,13 @@ w83781d_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, w83781d_detect);
+        return i2c_probe(adapter, &addr_data, w83781d_detect);
+}
+static int
+w83781d_isa_attach_adapter(struct i2c_adapter *adapter)
+{
+        return w83781d_detect(adapter, isa_address, -1);
 }
 /* Assumes that adapter is of I2C, not ISA variety.
@@ -961,10 +979,10 @@ w83781d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
 ERROR_SC_3:
        i2c_detach_client(data->lm75[0]);
 ERROR_SC_2:
-        if (NULL != data->lm75[1])
+        if (data->lm75[1])
                kfree(data->lm75[1]);
 ERROR_SC_1:
-        if (NULL != data->lm75[0])
+        if (data->lm75[0])
                kfree(data->lm75[0]);
 ERROR_SC_0:
        return err;
@@ -999,7 +1017,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
        
        if (is_isa)
                if (!request_region(address, W83781D_EXTENT,
-                                    w83781d_driver.name)) {
+                                    w83781d_isa_driver.name)) {
                        dev_dbg(&adapter->dev, "Request of region "
                                "0x%x-0x%x for w83781d failed\n", address,
                                address + W83781D_EXTENT - 1);
@@ -1057,7 +1075,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
        new_client->addr = address;
        init_MUTEX(&data->lock);
        new_client->adapter = adapter;
-        new_client->driver = &w83781d_driver;
+        new_client->driver = is_isa ? &w83781d_isa_driver : &w83781d_driver;
        new_client->flags = 0;
        /* Now, we do the remaining detection. */
@@ -1189,6 +1207,12 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
                        data->pwmenable[i] = 1;
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR4;
+        }
        device_create_file_in(new_client, 0);
        if (kind != w83783s)
                device_create_file_in(new_client, 1);
@@ -1241,6 +1265,15 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
        return 0;
+ERROR4:
+        if (data->lm75[1]) {
+                i2c_detach_client(data->lm75[1]);
+                kfree(data->lm75[1]);
+        }
+        if (data->lm75[0]) {
+                i2c_detach_client(data->lm75[0]);
+                kfree(data->lm75[0]);
+        }
 ERROR3:
        i2c_detach_client(new_client);
 ERROR2:
@@ -1255,24 +1288,26 @@ ERROR0:
 static int
 w83781d_detach_client(struct i2c_client *client)
 {
+        struct w83781d_data *data = i2c_get_clientdata(client);
        int err;
+        /* main client */
+        if (data)
+                hwmon_device_unregister(data->class_dev);
        if (i2c_is_isa_client(client))
                release_region(client->addr, W83781D_EXTENT);
-        if ((err = i2c_detach_client(client))) {
+        if ((err = i2c_detach_client(client)))
-                dev_err(&client->dev,
-                       "Client deregistration failed, client not detached.\n");
                return err;
-        }
-        if (i2c_get_clientdata(client)==NULL) {
+        /* main client */
-                /* subclients */
+        if (data)
+                kfree(data);
+        /* subclient */
+        else
                kfree(client);
-        } else {
-                /* main client */
-                kfree(i2c_get_clientdata(client));
-        }
        return 0;
 }
@@ -1443,7 +1478,7 @@ w83781d_init_client(struct i2c_client *client)
                w83781d_write_value(client, W83781D_REG_BEEP_INTS2, 0);
        }
-        data->vrm = i2c_which_vrm();
+        data->vrm = vid_which_vrm();
        if ((type != w83781d) && (type != as99127f)) {
                tmp = w83781d_read_value(client, W83781D_REG_SCFG1);
@@ -1613,12 +1648,25 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
 static int __init
 sensors_w83781d_init(void)
 {
-        return i2c_add_driver(&w83781d_driver);
+        int res;
+        res = i2c_add_driver(&w83781d_driver);
+        if (res)
+                return res;
+        res = i2c_isa_add_driver(&w83781d_isa_driver);
+        if (res) {
+                i2c_del_driver(&w83781d_driver);
+                return res;
+        }
+        return 0;
 }
 static void __exit
 sensors_w83781d_exit(void)
 {
+        i2c_isa_del_driver(&w83781d_isa_driver);
        i2c_del_driver(&w83781d_driver);
 }
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c
new file mode 100644
index 000000000000..ba0c28015f6a
--- /dev/null
+++ b/drivers/hwmon/w83792d.c
@@ -0,0 +1,1649 @@
+/*
+    w83792d.c - Part of lm_sensors, Linux kernel modules for hardware
+                monitoring
+    Copyright (C) 2004, 2005 Winbond Electronics Corp.
+                        Chunhao Huang <DZShen@Winbond.com.tw>,
+                        Rudolf Marek <r.marek@sh.cvut.cz>
+    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.
+    Note:
+    1. This driver is only for 2.6 kernel, 2.4 kernel need a different driver.
+    2. This driver is only for Winbond W83792D C version device, there
+       are also some motherboards with B version W83792D device. The
+       calculation method to in6-in7(measured value, limits) is a little
+       different between C and B version. C or B version can be identified
+       by CR[0x49h].
+*/
+/*
+    Supports following chips:
+    Chip        #vin    #fanin  #pwm    #temp   wchipid vendid  i2c     ISA
+    w83792d     9       7       7       3       0x7a    0x5ca3  yes     no
+*/
+#include <linux/config.h>
+#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>
+/* Addresses to scan */
+static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
+/* Insmod parameters */
+I2C_CLIENT_INSMOD_1(w83792d);
+I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
+                        "{bus, clientaddr, subclientaddr1, subclientaddr2}");
+static int init;
+module_param(init, bool, 0);
+MODULE_PARM_DESC(init, "Set to one to force chip initialization");
+/* The W83792D registers */
+static const u8 W83792D_REG_IN[9] = {
+        0x20,   /* Vcore A in DataSheet */
+        0x21,   /* Vcore B in DataSheet */
+        0x22,   /* VIN0 in DataSheet */
+        0x23,   /* VIN1 in DataSheet */
+        0x24,   /* VIN2 in DataSheet */
+        0x25,   /* VIN3 in DataSheet */
+        0x26,   /* 5VCC in DataSheet */
+        0xB0,   /* 5VSB in DataSheet */
+        0xB1    /* VBAT in DataSheet */
+};
+#define W83792D_REG_LOW_BITS1 0x3E  /* Low Bits I in DataSheet */
+#define W83792D_REG_LOW_BITS2 0x3F  /* Low Bits II in DataSheet */
+static const u8 W83792D_REG_IN_MAX[9] = {
+        0x2B,   /* Vcore A High Limit in DataSheet */
+        0x2D,   /* Vcore B High Limit in DataSheet */
+        0x2F,   /* VIN0 High Limit in DataSheet */
+        0x31,   /* VIN1 High Limit in DataSheet */
+        0x33,   /* VIN2 High Limit in DataSheet */
+        0x35,   /* VIN3 High Limit in DataSheet */
+        0x37,   /* 5VCC High Limit in DataSheet */
+        0xB4,   /* 5VSB High Limit in DataSheet */
+        0xB6    /* VBAT High Limit in DataSheet */
+};
+static const u8 W83792D_REG_IN_MIN[9] = {
+        0x2C,   /* Vcore A Low Limit in DataSheet */
+        0x2E,   /* Vcore B Low Limit in DataSheet */
+        0x30,   /* VIN0 Low Limit in DataSheet */
+        0x32,   /* VIN1 Low Limit in DataSheet */
+        0x34,   /* VIN2 Low Limit in DataSheet */
+        0x36,   /* VIN3 Low Limit in DataSheet */
+        0x38,   /* 5VCC Low Limit in DataSheet */
+        0xB5,   /* 5VSB Low Limit in DataSheet */
+        0xB7    /* VBAT Low Limit in DataSheet */
+};
+static const u8 W83792D_REG_FAN[7] = {
+        0x28,   /* FAN 1 Count in DataSheet */
+        0x29,   /* FAN 2 Count in DataSheet */
+        0x2A,   /* FAN 3 Count in DataSheet */
+        0xB8,   /* FAN 4 Count in DataSheet */
+        0xB9,   /* FAN 5 Count in DataSheet */
+        0xBA,   /* FAN 6 Count in DataSheet */
+        0xBE    /* FAN 7 Count in DataSheet */
+};
+static const u8 W83792D_REG_FAN_MIN[7] = {
+        0x3B,   /* FAN 1 Count Low Limit in DataSheet */
+        0x3C,   /* FAN 2 Count Low Limit in DataSheet */
+        0x3D,   /* FAN 3 Count Low Limit in DataSheet */
+        0xBB,   /* FAN 4 Count Low Limit in DataSheet */
+        0xBC,   /* FAN 5 Count Low Limit in DataSheet */
+        0xBD,   /* FAN 6 Count Low Limit in DataSheet */
+        0xBF    /* FAN 7 Count Low Limit in DataSheet */
+};
+#define W83792D_REG_FAN_CFG 0x84        /* FAN Configuration in DataSheet */
+static const u8 W83792D_REG_FAN_DIV[4] = {
+        0x47,   /* contains FAN2 and FAN1 Divisor */
+        0x5B,   /* contains FAN4 and FAN3 Divisor */
+        0x5C,   /* contains FAN6 and FAN5 Divisor */
+        0x9E    /* contains FAN7 Divisor. */
+};
+static const u8 W83792D_REG_PWM[7] = {
+        0x81,   /* FAN 1 Duty Cycle, be used to control */
+        0x83,   /* FAN 2 Duty Cycle, be used to control */
+        0x94,   /* FAN 3 Duty Cycle, be used to control */
+        0xA3,   /* FAN 4 Duty Cycle, be used to control */
+        0xA4,   /* FAN 5 Duty Cycle, be used to control */
+        0xA5,   /* FAN 6 Duty Cycle, be used to control */
+        0xA6    /* FAN 7 Duty Cycle, be used to control */
+};
+#define W83792D_REG_BANK                0x4E
+#define W83792D_REG_TEMP2_CONFIG        0xC2
+#define W83792D_REG_TEMP3_CONFIG        0xCA
+static const u8 W83792D_REG_TEMP1[3] = {
+        0x27,   /* TEMP 1 in DataSheet */
+        0x39,   /* TEMP 1 Over in DataSheet */
+        0x3A,   /* TEMP 1 Hyst in DataSheet */
+};
+static const u8 W83792D_REG_TEMP_ADD[2][6] = {
+        { 0xC0,         /* TEMP 2 in DataSheet */
+          0xC1,         /* TEMP 2(0.5 deg) in DataSheet */
+          0xC5,         /* TEMP 2 Over High part in DataSheet */
+          0xC6,         /* TEMP 2 Over Low part in DataSheet */
+          0xC3,         /* TEMP 2 Thyst High part in DataSheet */
+          0xC4 },       /* TEMP 2 Thyst Low part in DataSheet */
+        { 0xC8,         /* TEMP 3 in DataSheet */
+          0xC9,         /* TEMP 3(0.5 deg) in DataSheet */
+          0xCD,         /* TEMP 3 Over High part in DataSheet */
+          0xCE,         /* TEMP 3 Over Low part in DataSheet */
+          0xCB,         /* TEMP 3 Thyst High part in DataSheet */
+          0xCC }        /* TEMP 3 Thyst Low part in DataSheet */
+};
+static const u8 W83792D_REG_THERMAL[3] = {
+        0x85,   /* SmartFanI: Fan1 target value */
+        0x86,   /* SmartFanI: Fan2 target value */
+        0x96    /* SmartFanI: Fan3 target value */
+};
+static const u8 W83792D_REG_TOLERANCE[3] = {
+        0x87,   /* (bit3-0)SmartFan Fan1 tolerance */
+        0x87,   /* (bit7-4)SmartFan Fan2 tolerance */
+        0x97    /* (bit3-0)SmartFan Fan3 tolerance */
+};
+static const u8 W83792D_REG_POINTS[3][4] = {
+        { 0x85,         /* SmartFanII: Fan1 temp point 1 */
+          0xE3,         /* SmartFanII: Fan1 temp point 2 */
+          0xE4,         /* SmartFanII: Fan1 temp point 3 */
+          0xE5 },       /* SmartFanII: Fan1 temp point 4 */
+        { 0x86,         /* SmartFanII: Fan2 temp point 1 */
+          0xE6,         /* SmartFanII: Fan2 temp point 2 */
+          0xE7,         /* SmartFanII: Fan2 temp point 3 */
+          0xE8 },       /* SmartFanII: Fan2 temp point 4 */
+        { 0x96,         /* SmartFanII: Fan3 temp point 1 */
+          0xE9,         /* SmartFanII: Fan3 temp point 2 */
+          0xEA,         /* SmartFanII: Fan3 temp point 3 */
+          0xEB }        /* SmartFanII: Fan3 temp point 4 */
+};
+static const u8 W83792D_REG_LEVELS[3][4] = {
+        { 0x88,         /* (bit3-0) SmartFanII: Fan1 Non-Stop */
+          0x88,         /* (bit7-4) SmartFanII: Fan1 Level 1 */
+          0xE0,         /* (bit7-4) SmartFanII: Fan1 Level 2 */
+          0xE0 },       /* (bit3-0) SmartFanII: Fan1 Level 3 */
+        { 0x89,         /* (bit3-0) SmartFanII: Fan2 Non-Stop */
+          0x89,         /* (bit7-4) SmartFanII: Fan2 Level 1 */
+          0xE1,         /* (bit7-4) SmartFanII: Fan2 Level 2 */
+          0xE1 },       /* (bit3-0) SmartFanII: Fan2 Level 3 */
+        { 0x98,         /* (bit3-0) SmartFanII: Fan3 Non-Stop */
+          0x98,         /* (bit7-4) SmartFanII: Fan3 Level 1 */
+          0xE2,         /* (bit7-4) SmartFanII: Fan3 Level 2 */
+          0xE2 }        /* (bit3-0) SmartFanII: Fan3 Level 3 */
+};
+#define W83792D_REG_CONFIG              0x40
+#define W83792D_REG_VID_FANDIV          0x47
+#define W83792D_REG_CHIPID              0x49
+#define W83792D_REG_WCHIPID             0x58
+#define W83792D_REG_CHIPMAN             0x4F
+#define W83792D_REG_PIN                 0x4B
+#define W83792D_REG_I2C_SUBADDR         0x4A
+#define W83792D_REG_ALARM1 0xA9         /* realtime status register1 */
+#define W83792D_REG_ALARM2 0xAA         /* realtime status register2 */
+#define W83792D_REG_ALARM3 0xAB         /* realtime status register3 */
+#define W83792D_REG_CHASSIS 0x42        /* Bit 5: Case Open status bit */
+#define W83792D_REG_CHASSIS_CLR 0x44    /* Bit 7: Case Open CLR_CHS/Reset bit */
+/* control in0/in1 's limit modifiability */
+#define W83792D_REG_VID_IN_B            0x17
+#define W83792D_REG_VBAT                0x5D
+#define W83792D_REG_I2C_ADDR            0x48
+/* Conversions. Rounding and limit checking is only done on the TO_REG
+   variants. Note that you should be a bit careful with which arguments
+   these macros are called: arguments may be evaluated more than once.
+   Fixing this is just not worth it. */
+#define IN_FROM_REG(nr,val) (((nr)<=1)?(val*2): \
+                                ((((nr)==6)||((nr)==7))?(val*6):(val*4)))
+#define IN_TO_REG(nr,val) (((nr)<=1)?(val/2): \
+                                ((((nr)==6)||((nr)==7))?(val/6):(val/4)))
+static inline u8
+FAN_TO_REG(long rpm, int div)
+{
+        if (rpm == 0)
+                return 255;
+        rpm = SENSORS_LIMIT(rpm, 1, 1000000);
+        return SENSORS_LIMIT((1350000 + rpm * div / 2) / (rpm * div), 1, 254);
+}
+#define FAN_FROM_REG(val,div)   ((val) == 0   ? -1 : \
+                                ((val) == 255 ? 0 : \
+                                                1350000 / ((val) * (div))))
+/* for temp1 */
+#define TEMP1_TO_REG(val)       (SENSORS_LIMIT(((val) < 0 ? (val)+0x100*1000 \
+                                        : (val)) / 1000, 0, 0xff))
+#define TEMP1_FROM_REG(val)     (((val) & 0x80 ? (val)-0x100 : (val)) * 1000)
+/* for temp2 and temp3, because they need addtional resolution */
+#define TEMP_ADD_FROM_REG(val1, val2) \
+        ((((val1) & 0x80 ? (val1)-0x100 \
+                : (val1)) * 1000) + ((val2 & 0x80) ? 500 : 0))
+#define TEMP_ADD_TO_REG_HIGH(val) \
+        (SENSORS_LIMIT(((val) < 0 ? (val)+0x100*1000 \
+                        : (val)) / 1000, 0, 0xff))
+#define TEMP_ADD_TO_REG_LOW(val)        ((val%1000) ? 0x80 : 0x00)
+#define PWM_FROM_REG(val)               (val)
+#define PWM_TO_REG(val)                 (SENSORS_LIMIT((val),0,255))
+#define DIV_FROM_REG(val)               (1 << (val))
+static inline u8
+DIV_TO_REG(long val)
+{
+        int i;
+        val = SENSORS_LIMIT(val, 1, 128) >> 1;
+        for (i = 0; i < 6; i++) {
+                if (val == 0)
+                        break;
+                val >>= 1;
+        }
+        return ((u8) i);
+}
+struct w83792d_data {
+        struct i2c_client client;
+        struct class_device *class_dev;
+        struct semaphore lock;
+        enum chips type;
+        struct semaphore update_lock;
+        char valid;             /* !=0 if following fields are valid */
+        unsigned long last_updated;     /* In jiffies */
+        /* array of 2 pointers to subclients */
+        struct i2c_client *lm75[2];
+        u8 in[9];               /* Register value */
+        u8 in_max[9];           /* Register value */
+        u8 in_min[9];           /* Register value */
+        u8 low_bits[2];         /* Additional resolution to voltage in0-6 */
+        u8 fan[7];              /* Register value */
+        u8 fan_min[7];          /* Register value */
+        u8 temp1[3];            /* current, over, thyst */
+        u8 temp_add[2][6];      /* Register value */
+        u8 fan_div[7];          /* Register encoding, shifted right */
+        u8 pwm[7];              /* We only consider the first 3 set of pwm,
+                                   although 792 chip has 7 set of pwm. */
+        u8 pwmenable[3];
+        u8 pwm_mode[7];         /* indicates PWM or DC mode: 1->PWM; 0->DC */
+        u32 alarms;             /* realtime status register encoding,combined */
+        u8 chassis;             /* Chassis status */
+        u8 chassis_clear;       /* CLR_CHS, clear chassis intrusion detection */
+        u8 thermal_cruise[3];   /* Smart FanI: Fan1,2,3 target value */
+        u8 tolerance[3];        /* Fan1,2,3 tolerance(Smart Fan I/II) */
+        u8 sf2_points[3][4];    /* Smart FanII: Fan1,2,3 temperature points */
+        u8 sf2_levels[3][4];    /* Smart FanII: Fan1,2,3 duty cycle levels */
+};
+static int w83792d_attach_adapter(struct i2c_adapter *adapter);
+static int w83792d_detect(struct i2c_adapter *adapter, int address, int kind);
+static int w83792d_detach_client(struct i2c_client *client);
+static int w83792d_read_value(struct i2c_client *client, u8 register);
+static int w83792d_write_value(struct i2c_client *client, u8 register,
+                                u8 value);
+static struct w83792d_data *w83792d_update_device(struct device *dev);
+#ifdef DEBUG
+static void w83792d_print_debug(struct w83792d_data *data, struct device *dev);
+#endif
+static void w83792d_init_client(struct i2c_client *client);
+static struct i2c_driver w83792d_driver = {
+        .owner = THIS_MODULE,
+        .name = "w83792d",
+        .flags = I2C_DF_NOTIFY,
+        .attach_adapter = w83792d_attach_adapter,
+        .detach_client = w83792d_detach_client,
+};
+static long in_count_from_reg(int nr, struct w83792d_data *data)
+{
+        u16 vol_count = data->in[nr];
+        u16 low_bits = 0;
+        vol_count = (vol_count << 2);
+        switch (nr)
+        {
+        case 0:  /* vin0 */
+                low_bits = (data->low_bits[0]) & 0x03;
+                break;
+        case 1:  /* vin1 */
+                low_bits = ((data->low_bits[0]) & 0x0c) >> 2;
+                break;
+        case 2:  /* vin2 */
+                low_bits = ((data->low_bits[0]) & 0x30) >> 4;
+                break;
+        case 3:  /* vin3 */
+                low_bits = ((data->low_bits[0]) & 0xc0) >> 6;
+                break;
+        case 4:  /* vin4 */
+                low_bits = (data->low_bits[1]) & 0x03;
+                break;
+        case 5:  /* vin5 */
+                low_bits = ((data->low_bits[1]) & 0x0c) >> 2;
+                break;
+        case 6:  /* vin6 */
+                low_bits = ((data->low_bits[1]) & 0x30) >> 4;
+        default:
+                break;
+        }
+        vol_count = vol_count | low_bits;
+        return vol_count;
+}
+/* following are the sysfs callback functions */
+static ssize_t show_in(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf,"%ld\n", IN_FROM_REG(nr,(in_count_from_reg(nr, data))));
+}
+#define show_in_reg(reg) \
+static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
+                        char *buf) \
+{ \
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
+        int nr = sensor_attr->index; \
+        struct w83792d_data *data = w83792d_update_device(dev); \
+        return sprintf(buf,"%ld\n", (long)(IN_FROM_REG(nr, (data->reg[nr])*4))); \
+}
+show_in_reg(in_min);
+show_in_reg(in_max);
+#define store_in_reg(REG, reg) \
+static ssize_t store_in_##reg (struct device *dev, \
+                                struct device_attribute *attr, \
+                                const char *buf, size_t count) \
+{ \
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
+        int nr = sensor_attr->index; \
+        struct i2c_client *client = to_i2c_client(dev); \
+        struct w83792d_data *data = i2c_get_clientdata(client); \
+        u32 val; \
+         \
+        val = simple_strtoul(buf, NULL, 10); \
+        data->in_##reg[nr] = SENSORS_LIMIT(IN_TO_REG(nr, val)/4, 0, 255); \
+        w83792d_write_value(client, W83792D_REG_IN_##REG[nr], data->in_##reg[nr]); \
+         \
+        return count; \
+}
+store_in_reg(MIN, min);
+store_in_reg(MAX, max);
+#define sysfs_in_reg(offset) \
+static SENSOR_DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in, \
+                                NULL, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \
+                                show_in_min, store_in_min, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \
+                                show_in_max, store_in_max, offset);
+sysfs_in_reg(0);
+sysfs_in_reg(1);
+sysfs_in_reg(2);
+sysfs_in_reg(3);
+sysfs_in_reg(4);
+sysfs_in_reg(5);
+sysfs_in_reg(6);
+sysfs_in_reg(7);
+sysfs_in_reg(8);
+#define device_create_file_in(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_in##offset##_input.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_in##offset##_max.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_in##offset##_min.dev_attr); \
+} while (0)
+#define show_fan_reg(reg) \
+static ssize_t show_##reg (struct device *dev, struct device_attribute *attr, \
+                        char *buf) \
+{ \
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
+        int nr = sensor_attr->index - 1; \
+        struct w83792d_data *data = w83792d_update_device(dev); \
+        return sprintf(buf,"%d\n", \
+                FAN_FROM_REG(data->reg[nr], DIV_FROM_REG(data->fan_div[nr]))); \
+}
+show_fan_reg(fan);
+show_fan_reg(fan_min);
+static ssize_t
+store_fan_min(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        val = simple_strtoul(buf, NULL, 10);
+        data->fan_min[nr] = FAN_TO_REG(val, DIV_FROM_REG(data->fan_div[nr]));
+        w83792d_write_value(client, W83792D_REG_FAN_MIN[nr],
+                                data->fan_min[nr]);
+        return count;
+}
+static ssize_t
+show_fan_div(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%u\n", DIV_FROM_REG(data->fan_div[nr - 1]));
+}
+/* Note: we save and restore the fan minimum here, because its value is
+   determined in part by the fan divisor.  This follows the principle of
+   least suprise; the user doesn't expect the fan minimum to change just
+   because the divisor changed. */
+static ssize_t
+store_fan_div(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        unsigned long min;
+        /*u8 reg;*/
+        u8 fan_div_reg = 0;
+        u8 tmp_fan_div;
+        /* Save fan_min */
+        min = FAN_FROM_REG(data->fan_min[nr],
+                           DIV_FROM_REG(data->fan_div[nr]));
+        data->fan_div[nr] = DIV_TO_REG(simple_strtoul(buf, NULL, 10));
+        fan_div_reg = w83792d_read_value(client, W83792D_REG_FAN_DIV[nr >> 1]);
+        fan_div_reg &= (nr & 0x01) ? 0x8f : 0xf8;
+        tmp_fan_div = (nr & 0x01) ? (((data->fan_div[nr]) << 4) & 0x70)
+                                        : ((data->fan_div[nr]) & 0x07);
+        w83792d_write_value(client, W83792D_REG_FAN_DIV[nr >> 1],
+                                        fan_div_reg | tmp_fan_div);
+        /* Restore fan_min */
+        data->fan_min[nr] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[nr]));
+        w83792d_write_value(client, W83792D_REG_FAN_MIN[nr], data->fan_min[nr]);
+        return count;
+}
+#define sysfs_fan(offset) \
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan, NULL, \
+                                offset); \
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
+                                show_fan_div, store_fan_div, offset); \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
+                                show_fan_min, store_fan_min, offset);
+sysfs_fan(1);
+sysfs_fan(2);
+sysfs_fan(3);
+sysfs_fan(4);
+sysfs_fan(5);
+sysfs_fan(6);
+sysfs_fan(7);
+#define device_create_file_fan(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_fan##offset##_input.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_fan##offset##_div.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_fan##offset##_min.dev_attr); \
+} while (0)
+/* read/write the temperature1, includes measured value and limits */
+static ssize_t show_temp1(struct device *dev, struct device_attribute *attr,
+                                char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", TEMP1_FROM_REG(data->temp1[nr]));
+}
+static ssize_t store_temp1(struct device *dev, struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        s32 val;
+        val = simple_strtol(buf, NULL, 10);
+        data->temp1[nr] = TEMP1_TO_REG(val);
+        w83792d_write_value(client, W83792D_REG_TEMP1[nr],
+                data->temp1[nr]);
+        return count;
+}
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp1, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IRUGO | S_IWUSR, show_temp1,
+                                store_temp1, 1);
+static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IRUGO | S_IWUSR, show_temp1,
+                                store_temp1, 2);
+#define device_create_file_temp1(client) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_temp1_input.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_temp1_max.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_temp1_max_hyst.dev_attr); \
+} while (0)
+/* read/write the temperature2-3, includes measured value and limits */
+static ssize_t show_temp23(struct device *dev, struct device_attribute *attr,
+                                char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf,"%ld\n",
+                (long)TEMP_ADD_FROM_REG(data->temp_add[nr][index],
+                        data->temp_add[nr][index+1]));
+}
+static ssize_t store_temp23(struct device *dev, struct device_attribute *attr,
+                                const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        s32 val;
+        val = simple_strtol(buf, NULL, 10);
+        data->temp_add[nr][index] = TEMP_ADD_TO_REG_HIGH(val);
+        data->temp_add[nr][index+1] = TEMP_ADD_TO_REG_LOW(val);
+        w83792d_write_value(client, W83792D_REG_TEMP_ADD[nr][index],
+                data->temp_add[nr][index]);
+        w83792d_write_value(client, W83792D_REG_TEMP_ADD[nr][index+1],
+                data->temp_add[nr][index+1]);
+        return count;
+}
+#define sysfs_temp23(name,idx) \
+static SENSOR_DEVICE_ATTR_2(name##_input, S_IRUGO, show_temp23, NULL, \
+                                idx, 0); \
+static SENSOR_DEVICE_ATTR_2(name##_max, S_IRUGO | S_IWUSR, \
+                                show_temp23, store_temp23, idx, 2); \
+static SENSOR_DEVICE_ATTR_2(name##_max_hyst, S_IRUGO | S_IWUSR, \
+                                show_temp23, store_temp23, idx, 4);
+sysfs_temp23(temp2,0)
+sysfs_temp23(temp3,1)
+#define device_create_file_temp_add(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_temp##offset##_input.dev_attr); \
+device_create_file(&client->dev, &sensor_dev_attr_temp##offset##_max.dev_attr); \
+device_create_file(&client->dev, \
+&sensor_dev_attr_temp##offset##_max_hyst.dev_attr); \
+} while (0)
+/* get reatime status of all sensors items: voltage, temp, fan */
+static ssize_t
+show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", data->alarms);
+}
+static
+DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
+#define device_create_file_alarms(client) \
+device_create_file(&client->dev, &dev_attr_alarms);
+static ssize_t
+show_pwm(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%ld\n", (long) PWM_FROM_REG(data->pwm[nr-1]));
+}
+static ssize_t
+show_pwmenable(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        long pwm_enable_tmp = 1;
+        switch (data->pwmenable[nr]) {
+        case 0:
+                pwm_enable_tmp = 1; /* manual mode */
+                break;
+        case 1:
+                pwm_enable_tmp = 3; /*thermal cruise/Smart Fan I */
+                break;
+        case 2:
+                pwm_enable_tmp = 2; /* Smart Fan II */
+                break;
+        }
+        return sprintf(buf, "%ld\n", pwm_enable_tmp);
+}
+static ssize_t
+store_pwm(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        val = simple_strtoul(buf, NULL, 10);
+        data->pwm[nr] = PWM_TO_REG(val);
+        w83792d_write_value(client, W83792D_REG_PWM[nr], data->pwm[nr]);
+        return count;
+}
+static ssize_t
+store_pwmenable(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 fan_cfg_tmp, cfg1_tmp, cfg2_tmp, cfg3_tmp, cfg4_tmp;
+        val = simple_strtoul(buf, NULL, 10);
+        switch (val) {
+        case 1:
+                data->pwmenable[nr] = 0; /* manual mode */
+                break;
+        case 2:
+                data->pwmenable[nr] = 2; /* Smart Fan II */
+                break;
+        case 3:
+                data->pwmenable[nr] = 1; /* thermal cruise/Smart Fan I */
+                break;
+        default:
+                return -EINVAL;
+        }
+        cfg1_tmp = data->pwmenable[0];
+        cfg2_tmp = (data->pwmenable[1]) << 2;
+        cfg3_tmp = (data->pwmenable[2]) << 4;
+        cfg4_tmp = w83792d_read_value(client,W83792D_REG_FAN_CFG) & 0xc0;
+        fan_cfg_tmp = ((cfg4_tmp | cfg3_tmp) | cfg2_tmp) | cfg1_tmp;
+        w83792d_write_value(client, W83792D_REG_FAN_CFG, fan_cfg_tmp);
+        return count;
+}
+#define sysfs_pwm(offset) \
+static SENSOR_DEVICE_ATTR(pwm##offset, S_IRUGO | S_IWUSR, \
+                                show_pwm, store_pwm, offset); \
+static SENSOR_DEVICE_ATTR(pwm##offset##_enable, S_IRUGO | S_IWUSR, \
+                                show_pwmenable, store_pwmenable, offset); \
+sysfs_pwm(1);
+sysfs_pwm(2);
+sysfs_pwm(3);
+#define device_create_file_pwm(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_pwm##offset.dev_attr); \
+} while (0)
+#define device_create_file_pwmenable(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_pwm##offset##_enable.dev_attr); \
+} while (0)
+static ssize_t
+show_pwm_mode(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", data->pwm_mode[nr-1]);
+}
+static ssize_t
+store_pwm_mode(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 pwm_mode_mask = 0;
+        val = simple_strtoul(buf, NULL, 10);
+        data->pwm_mode[nr] = SENSORS_LIMIT(val, 0, 1);
+        pwm_mode_mask = w83792d_read_value(client,
+                W83792D_REG_PWM[nr]) & 0x7f;
+        w83792d_write_value(client, W83792D_REG_PWM[nr],
+                ((data->pwm_mode[nr]) << 7) | pwm_mode_mask);
+        return count;
+}
+#define sysfs_pwm_mode(offset) \
+static SENSOR_DEVICE_ATTR(pwm##offset##_mode, S_IRUGO | S_IWUSR, \
+                                show_pwm_mode, store_pwm_mode, offset);
+sysfs_pwm_mode(1);
+sysfs_pwm_mode(2);
+sysfs_pwm_mode(3);
+#define device_create_file_pwm_mode(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_pwm##offset##_mode.dev_attr); \
+} while (0)
+static ssize_t
+show_regs_chassis(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", data->chassis);
+}
+static DEVICE_ATTR(chassis, S_IRUGO, show_regs_chassis, NULL);
+#define device_create_file_chassis(client) \
+do { \
+device_create_file(&client->dev, &dev_attr_chassis); \
+} while (0)
+static ssize_t
+show_chassis_clear(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n", data->chassis_clear);
+}
+static ssize_t
+store_chassis_clear(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 temp1 = 0, temp2 = 0;
+        val = simple_strtoul(buf, NULL, 10);
+        data->chassis_clear = SENSORS_LIMIT(val, 0 ,1);
+        temp1 = ((data->chassis_clear) << 7) & 0x80;
+        temp2 = w83792d_read_value(client,
+                W83792D_REG_CHASSIS_CLR) & 0x7f;
+        w83792d_write_value(client, W83792D_REG_CHASSIS_CLR, temp1 | temp2);
+        return count;
+}
+static DEVICE_ATTR(chassis_clear, S_IRUGO | S_IWUSR,
+                show_chassis_clear, store_chassis_clear);
+#define device_create_file_chassis_clear(client) \
+do { \
+device_create_file(&client->dev, &dev_attr_chassis_clear); \
+} while (0)
+/* For Smart Fan I / Thermal Cruise */
+static ssize_t
+show_thermal_cruise(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%ld\n", (long)data->thermal_cruise[nr-1]);
+}
+static ssize_t
+store_thermal_cruise(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 target_tmp=0, target_mask=0;
+        val = simple_strtoul(buf, NULL, 10);
+        target_tmp = val;
+        target_tmp = target_tmp & 0x7f;
+        target_mask = w83792d_read_value(client, W83792D_REG_THERMAL[nr]) & 0x80;
+        data->thermal_cruise[nr] = SENSORS_LIMIT(target_tmp, 0, 255);
+        w83792d_write_value(client, W83792D_REG_THERMAL[nr],
+                (data->thermal_cruise[nr]) | target_mask);
+        return count;
+}
+#define sysfs_thermal_cruise(offset) \
+static SENSOR_DEVICE_ATTR(thermal_cruise##offset, S_IRUGO | S_IWUSR, \
+                        show_thermal_cruise, store_thermal_cruise, offset);
+sysfs_thermal_cruise(1);
+sysfs_thermal_cruise(2);
+sysfs_thermal_cruise(3);
+#define device_create_file_thermal_cruise(client, offset) \
+do { \
+device_create_file(&client->dev, \
+&sensor_dev_attr_thermal_cruise##offset.dev_attr); \
+} while (0)
+/* For Smart Fan I/Thermal Cruise and Smart Fan II */
+static ssize_t
+show_tolerance(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%ld\n", (long)data->tolerance[nr-1]);
+}
+static ssize_t
+store_tolerance(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
+        int nr = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 tol_tmp, tol_mask;
+        val = simple_strtoul(buf, NULL, 10);
+        tol_mask = w83792d_read_value(client,
+                W83792D_REG_TOLERANCE[nr]) & ((nr == 1) ? 0x0f : 0xf0);
+        tol_tmp = SENSORS_LIMIT(val, 0, 15);
+        tol_tmp &= 0x0f;
+        data->tolerance[nr] = tol_tmp;
+        if (nr == 1) {
+                tol_tmp <<= 4;
+        }
+        w83792d_write_value(client, W83792D_REG_TOLERANCE[nr],
+                tol_mask | tol_tmp);
+        return count;
+}
+#define sysfs_tolerance(offset) \
+static SENSOR_DEVICE_ATTR(tolerance##offset, S_IRUGO | S_IWUSR, \
+                                show_tolerance, store_tolerance, offset);
+sysfs_tolerance(1);
+sysfs_tolerance(2);
+sysfs_tolerance(3);
+#define device_create_file_tolerance(client, offset) \
+do { \
+device_create_file(&client->dev, &sensor_dev_attr_tolerance##offset.dev_attr); \
+} while (0)
+/* For Smart Fan II */
+static ssize_t
+show_sf2_point(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%ld\n", (long)data->sf2_points[index-1][nr-1]);
+}
+static ssize_t
+store_sf2_point(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr - 1;
+        int index = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 mask_tmp = 0;
+        val = simple_strtoul(buf, NULL, 10);
+        data->sf2_points[index][nr] = SENSORS_LIMIT(val, 0, 127);
+        mask_tmp = w83792d_read_value(client,
+                                        W83792D_REG_POINTS[index][nr]) & 0x80;
+        w83792d_write_value(client, W83792D_REG_POINTS[index][nr],
+                mask_tmp|data->sf2_points[index][nr]);
+        return count;
+}
+#define sysfs_sf2_point(offset, index) \
+static SENSOR_DEVICE_ATTR_2(sf2_point##offset##_fan##index, S_IRUGO | S_IWUSR, \
+                                show_sf2_point, store_sf2_point, offset, index);
+sysfs_sf2_point(1, 1);  /* Fan1 */
+sysfs_sf2_point(2, 1);  /* Fan1 */
+sysfs_sf2_point(3, 1);  /* Fan1 */
+sysfs_sf2_point(4, 1);  /* Fan1 */
+sysfs_sf2_point(1, 2);  /* Fan2 */
+sysfs_sf2_point(2, 2);  /* Fan2 */
+sysfs_sf2_point(3, 2);  /* Fan2 */
+sysfs_sf2_point(4, 2);  /* Fan2 */
+sysfs_sf2_point(1, 3);  /* Fan3 */
+sysfs_sf2_point(2, 3);  /* Fan3 */
+sysfs_sf2_point(3, 3);  /* Fan3 */
+sysfs_sf2_point(4, 3);  /* Fan3 */
+#define device_create_file_sf2_point(client, offset, index) \
+do { \
+device_create_file(&client->dev, \
+&sensor_dev_attr_sf2_point##offset##_fan##index.dev_attr); \
+} while (0)
+static ssize_t
+show_sf2_level(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index;
+        struct w83792d_data *data = w83792d_update_device(dev);
+        return sprintf(buf, "%d\n",
+                        (((data->sf2_levels[index-1][nr]) * 100) / 15));
+}
+static ssize_t
+store_sf2_level(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
+{
+        struct sensor_device_attribute_2 *sensor_attr = to_sensor_dev_attr_2(attr);
+        int nr = sensor_attr->nr;
+        int index = sensor_attr->index - 1;
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        u32 val;
+        u8 mask_tmp=0, level_tmp=0;
+        val = simple_strtoul(buf, NULL, 10);
+        data->sf2_levels[index][nr] = SENSORS_LIMIT((val * 15) / 100, 0, 15);
+        mask_tmp = w83792d_read_value(client, W83792D_REG_LEVELS[index][nr])
+                & ((nr==3) ? 0xf0 : 0x0f);
+        if (nr==3) {
+                level_tmp = data->sf2_levels[index][nr];
+        } else {
+                level_tmp = data->sf2_levels[index][nr] << 4;
+        }
+        w83792d_write_value(client, W83792D_REG_LEVELS[index][nr], level_tmp | mask_tmp);
+        return count;
+}
+#define sysfs_sf2_level(offset, index) \
+static SENSOR_DEVICE_ATTR_2(sf2_level##offset##_fan##index, S_IRUGO | S_IWUSR, \
+                                show_sf2_level, store_sf2_level, offset, index);
+sysfs_sf2_level(1, 1);  /* Fan1 */
+sysfs_sf2_level(2, 1);  /* Fan1 */
+sysfs_sf2_level(3, 1);  /* Fan1 */
+sysfs_sf2_level(1, 2);  /* Fan2 */
+sysfs_sf2_level(2, 2);  /* Fan2 */
+sysfs_sf2_level(3, 2);  /* Fan2 */
+sysfs_sf2_level(1, 3);  /* Fan3 */
+sysfs_sf2_level(2, 3);  /* Fan3 */
+sysfs_sf2_level(3, 3);  /* Fan3 */
+#define device_create_file_sf2_level(client, offset, index) \
+do { \
+device_create_file(&client->dev, \
+&sensor_dev_attr_sf2_level##offset##_fan##index.dev_attr); \
+} while (0)
+/* This function is called when:
+     * w83792d_driver is inserted (when this module is loaded), for each
+       available adapter
+     * when a new adapter is inserted (and w83792d_driver is still present) */
+static int
+w83792d_attach_adapter(struct i2c_adapter *adapter)
+{
+        if (!(adapter->class & I2C_CLASS_HWMON))
+                return 0;
+        return i2c_probe(adapter, &addr_data, w83792d_detect);
+}
+static int
+w83792d_create_subclient(struct i2c_adapter *adapter,
+                                struct i2c_client *new_client, int addr,
+                                struct i2c_client **sub_cli)
+{
+        int err;
+        struct i2c_client *sub_client;
+        (*sub_cli) = sub_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        if (!(sub_client)) {
+                return -ENOMEM;
+        }
+        memset(sub_client, 0x00, sizeof(struct i2c_client));
+        sub_client->addr = 0x48 + addr;
+        i2c_set_clientdata(sub_client, NULL);
+        sub_client->adapter = adapter;
+        sub_client->driver = &w83792d_driver;
+        sub_client->flags = 0;
+        strlcpy(sub_client->name, "w83792d subclient", I2C_NAME_SIZE);
+        if ((err = i2c_attach_client(sub_client))) {
+                dev_err(&new_client->dev, "subclient registration "
+                        "at address 0x%x failed\n", sub_client->addr);
+                kfree(sub_client);
+                return err;
+        }
+        return 0;
+}
+static int
+w83792d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
+                struct i2c_client *new_client)
+{
+        int i, id, err;
+        u8 val;
+        struct w83792d_data *data = i2c_get_clientdata(new_client);
+        id = i2c_adapter_id(adapter);
+        if (force_subclients[0] == id && force_subclients[1] == address) {
+                for (i = 2; i <= 3; i++) {
+                        if (force_subclients[i] < 0x48 ||
+                            force_subclients[i] > 0x4f) {
+                                dev_err(&new_client->dev, "invalid subclient "
+                                        "address %d; must be 0x48-0x4f\n",
+                                        force_subclients[i]);
+                                err = -ENODEV;
+                                goto ERROR_SC_0;
+                        }
+                }
+                w83792d_write_value(new_client, W83792D_REG_I2C_SUBADDR,
+                                        (force_subclients[2] & 0x07) |
+                                        ((force_subclients[3] & 0x07) << 4));
+        }
+        val = w83792d_read_value(new_client, W83792D_REG_I2C_SUBADDR);
+        if (!(val & 0x08)) {
+                err = w83792d_create_subclient(adapter, new_client, val & 0x7,
+                                                &data->lm75[0]);
+                if (err < 0)
+                        goto ERROR_SC_0;
+        }
+        if (!(val & 0x80)) {
+                if ((data->lm75[0] != NULL) &&
+                        ((val & 0x7) == ((val >> 4) & 0x7))) {
+                        dev_err(&new_client->dev, "duplicate addresses 0x%x, "
+                                "use force_subclient\n", data->lm75[0]->addr);
+                        err = -ENODEV;
+                        goto ERROR_SC_1;
+                }
+                err = w83792d_create_subclient(adapter, new_client,
+                                                (val >> 4) & 0x7, &data->lm75[1]);
+                if (err < 0)
+                        goto ERROR_SC_1;
+        }
+        return 0;
+/* Undo inits in case of errors */
+ERROR_SC_1:
+        if (data->lm75[0] != NULL) {
+                i2c_detach_client(data->lm75[0]);
+                kfree(data->lm75[0]);
+        }
+ERROR_SC_0:
+        return err;
+}
+static int
+w83792d_detect(struct i2c_adapter *adapter, int address, int kind)
+{
+        int i = 0, val1 = 0, val2;
+        struct i2c_client *new_client;
+        struct w83792d_data *data;
+        int err = 0;
+        const char *client_name = "";
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+                goto ERROR0;
+        }
+        /* 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 w83792d_{read,write}_value. */
+        if (!(data = kmalloc(sizeof(struct w83792d_data), GFP_KERNEL))) {
+                err = -ENOMEM;
+                goto ERROR0;
+        }
+        memset(data, 0, sizeof(struct w83792d_data));
+        new_client = &data->client;
+        i2c_set_clientdata(new_client, data);
+        new_client->addr = address;
+        init_MUTEX(&data->lock);
+        new_client->adapter = adapter;
+        new_client->driver = &w83792d_driver;
+        new_client->flags = 0;
+        /* Now, we do the remaining detection. */
+        /* The w83792d may be stuck in some other bank than bank 0. This may
+           make reading other information impossible. Specify a force=... or
+           force_*=... parameter, and the Winbond will be reset to the right
+           bank. */
+        if (kind < 0) {
+                if (w83792d_read_value(new_client, W83792D_REG_CONFIG) & 0x80) {
+                        dev_warn(&new_client->dev, "Detection failed at step "
+                                "3\n");
+                        goto ERROR1;
+                }
+                val1 = w83792d_read_value(new_client, W83792D_REG_BANK);
+                val2 = w83792d_read_value(new_client, W83792D_REG_CHIPMAN);
+                /* Check for Winbond ID if in bank 0 */
+                if (!(val1 & 0x07)) {  /* is Bank0 */
+                        if (((!(val1 & 0x80)) && (val2 != 0xa3)) ||
+                             ((val1 & 0x80) && (val2 != 0x5c))) {
+                                goto ERROR1;
+                        }
+                }
+                /* If Winbond chip, address of chip and W83792D_REG_I2C_ADDR
+                   should match */
+                if (w83792d_read_value(new_client,
+                                        W83792D_REG_I2C_ADDR) != address) {
+                        dev_warn(&new_client->dev, "Detection failed "
+                                "at step 5\n");
+                        goto ERROR1;
+                }
+        }
+        /* We have either had a force parameter, or we have already detected the
+           Winbond. Put it now into bank 0 and Vendor ID High Byte */
+        w83792d_write_value(new_client,
+                            W83792D_REG_BANK,
+                            (w83792d_read_value(new_client,
+                                W83792D_REG_BANK) & 0x78) | 0x80);
+        /* Determine the chip type. */
+        if (kind <= 0) {
+                /* get vendor ID */
+                val2 = w83792d_read_value(new_client, W83792D_REG_CHIPMAN);
+                if (val2 != 0x5c) {  /* the vendor is NOT Winbond */
+                        goto ERROR1;
+                }
+                val1 = w83792d_read_value(new_client, W83792D_REG_WCHIPID);
+                if (val1 == 0x7a && address >= 0x2c) {
+                        kind = w83792d;
+                } else {
+                        if (kind == 0)
+                                        dev_warn(&new_client->dev,
+                                        "w83792d: Ignoring 'force' parameter for"
+                                        " unknown chip at adapter %d, address"
+                                        " 0x%02x\n", i2c_adapter_id(adapter),
+                                        address);
+                        goto ERROR1;
+                }
+        }
+        if (kind == w83792d) {
+                client_name = "w83792d";
+        } else {
+                dev_err(&new_client->dev, "w83792d: Internal error: unknown"
+                                          " kind (%d)?!?", kind);
+                goto ERROR1;
+        }
+        /* Fill in the remaining client fields and put into the global list */
+        strlcpy(new_client->name, client_name, I2C_NAME_SIZE);
+        data->type = kind;
+        data->valid = 0;
+        init_MUTEX(&data->update_lock);
+        /* Tell the I2C layer a new client has arrived */
+        if ((err = i2c_attach_client(new_client)))
+                goto ERROR1;
+        if ((err = w83792d_detect_subclients(adapter, address,
+                        kind, new_client)))
+                goto ERROR2;
+        /* Initialize the chip */
+        w83792d_init_client(new_client);
+        /* A few vars need to be filled upon startup */
+        for (i = 1; i <= 7; i++) {
+                data->fan_min[i - 1] = w83792d_read_value(new_client,
+                                        W83792D_REG_FAN_MIN[i]);
+        }
+        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto ERROR3;
+        }
+        device_create_file_in(new_client, 0);
+        device_create_file_in(new_client, 1);
+        device_create_file_in(new_client, 2);
+        device_create_file_in(new_client, 3);
+        device_create_file_in(new_client, 4);
+        device_create_file_in(new_client, 5);
+        device_create_file_in(new_client, 6);
+        device_create_file_in(new_client, 7);
+        device_create_file_in(new_client, 8);
+        device_create_file_fan(new_client, 1);
+        device_create_file_fan(new_client, 2);
+        device_create_file_fan(new_client, 3);
+        device_create_file_fan(new_client, 4);
+        device_create_file_fan(new_client, 5);
+        device_create_file_fan(new_client, 6);
+        device_create_file_fan(new_client, 7);
+        device_create_file_temp1(new_client);           /* Temp1 */
+        device_create_file_temp_add(new_client, 2);     /* Temp2 */
+        device_create_file_temp_add(new_client, 3);     /* Temp3 */
+        device_create_file_alarms(new_client);
+        device_create_file_pwm(new_client, 1);
+        device_create_file_pwm(new_client, 2);
+        device_create_file_pwm(new_client, 3);
+        device_create_file_pwmenable(new_client, 1);
+        device_create_file_pwmenable(new_client, 2);
+        device_create_file_pwmenable(new_client, 3);
+        device_create_file_pwm_mode(new_client, 1);
+        device_create_file_pwm_mode(new_client, 2);
+        device_create_file_pwm_mode(new_client, 3);
+        device_create_file_chassis(new_client);
+        device_create_file_chassis_clear(new_client);
+        device_create_file_thermal_cruise(new_client, 1);
+        device_create_file_thermal_cruise(new_client, 2);
+        device_create_file_thermal_cruise(new_client, 3);
+        device_create_file_tolerance(new_client, 1);
+        device_create_file_tolerance(new_client, 2);
+        device_create_file_tolerance(new_client, 3);
+        device_create_file_sf2_point(new_client, 1, 1); /* Fan1 */
+        device_create_file_sf2_point(new_client, 2, 1); /* Fan1 */
+        device_create_file_sf2_point(new_client, 3, 1); /* Fan1 */
+        device_create_file_sf2_point(new_client, 4, 1); /* Fan1 */
+        device_create_file_sf2_point(new_client, 1, 2); /* Fan2 */
+        device_create_file_sf2_point(new_client, 2, 2); /* Fan2 */
+        device_create_file_sf2_point(new_client, 3, 2); /* Fan2 */
+        device_create_file_sf2_point(new_client, 4, 2); /* Fan2 */
+        device_create_file_sf2_point(new_client, 1, 3); /* Fan3 */
+        device_create_file_sf2_point(new_client, 2, 3); /* Fan3 */
+        device_create_file_sf2_point(new_client, 3, 3); /* Fan3 */
+        device_create_file_sf2_point(new_client, 4, 3); /* Fan3 */
+        device_create_file_sf2_level(new_client, 1, 1); /* Fan1 */
+        device_create_file_sf2_level(new_client, 2, 1); /* Fan1 */
+        device_create_file_sf2_level(new_client, 3, 1); /* Fan1 */
+        device_create_file_sf2_level(new_client, 1, 2); /* Fan2 */
+        device_create_file_sf2_level(new_client, 2, 2); /* Fan2 */
+        device_create_file_sf2_level(new_client, 3, 2); /* Fan2 */
+        device_create_file_sf2_level(new_client, 1, 3); /* Fan3 */
+        device_create_file_sf2_level(new_client, 2, 3); /* Fan3 */
+        device_create_file_sf2_level(new_client, 3, 3); /* Fan3 */
+        return 0;
+ERROR3:
+        if (data->lm75[0] != NULL) {
+                i2c_detach_client(data->lm75[0]);
+                kfree(data->lm75[0]);
+        }
+        if (data->lm75[1] != NULL) {
+                i2c_detach_client(data->lm75[1]);
+                kfree(data->lm75[1]);
+        }
+ERROR2:
+        i2c_detach_client(new_client);
+ERROR1:
+        kfree(data);
+ERROR0:
+        return err;
+}
+static int
+w83792d_detach_client(struct i2c_client *client)
+{
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        int err;
+        /* main client */
+        if (data)
+                hwmon_device_unregister(data->class_dev);
+        if ((err = i2c_detach_client(client)))
+                return err;
+        /* main client */
+        if (data)
+                kfree(data);
+        /* subclient */
+        else
+                kfree(client);
+        return 0;
+}
+/* The SMBus locks itself, usually, but nothing may access the Winbond between
+   bank switches. ISA access must always be locked explicitly!
+   We ignore the W83792D BUSY flag at this moment - it could lead to deadlocks,
+   would slow down the W83792D access and should not be necessary.
+   There are some ugly typecasts here, but the good news is - they should
+   nowhere else be necessary! */
+static int
+w83792d_read_value(struct i2c_client *client, u8 reg)
+{
+        int res=0;
+        res = i2c_smbus_read_byte_data(client, reg);
+        return res;
+}
+static int
+w83792d_write_value(struct i2c_client *client, u8 reg, u8 value)
+{
+        i2c_smbus_write_byte_data(client, reg,  value);
+        return 0;
+}
+/* Called when we have found a new W83792D. It should set limits, etc. */
+static void
+w83792d_init_client(struct i2c_client *client)
+{
+        u8 temp2_cfg, temp3_cfg, vid_in_b;
+        if (init) {
+                w83792d_write_value(client, W83792D_REG_CONFIG, 0x80);
+        }
+        /* Clear the bit6 of W83792D_REG_VID_IN_B(set it into 0):
+           W83792D_REG_VID_IN_B bit6 = 0: the high/low limit of
+             vin0/vin1 can be modified by user;
+           W83792D_REG_VID_IN_B bit6 = 1: the high/low limit of
+             vin0/vin1 auto-updated, can NOT be modified by user. */
+        vid_in_b = w83792d_read_value(client, W83792D_REG_VID_IN_B);
+        w83792d_write_value(client, W83792D_REG_VID_IN_B,
+                            vid_in_b & 0xbf);
+        temp2_cfg = w83792d_read_value(client, W83792D_REG_TEMP2_CONFIG);
+        temp3_cfg = w83792d_read_value(client, W83792D_REG_TEMP3_CONFIG);
+        w83792d_write_value(client, W83792D_REG_TEMP2_CONFIG,
+                                temp2_cfg & 0xe6);
+        w83792d_write_value(client, W83792D_REG_TEMP3_CONFIG,
+                                temp3_cfg & 0xe6);
+        /* Start monitoring */
+        w83792d_write_value(client, W83792D_REG_CONFIG,
+                            (w83792d_read_value(client,
+                                                W83792D_REG_CONFIG) & 0xf7)
+                            | 0x01);
+}
+static struct w83792d_data *w83792d_update_device(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct w83792d_data *data = i2c_get_clientdata(client);
+        int i, j;
+        u8 reg_array_tmp[4], pwm_array_tmp[7], reg_tmp;
+        down(&data->update_lock);
+        if (time_after
+            (jiffies - data->last_updated, (unsigned long) (HZ * 3))
+            || time_before(jiffies, data->last_updated) || !data->valid) {
+                dev_dbg(dev, "Starting device update\n");
+                /* Update the voltages measured value and limits */
+                for (i = 0; i < 9; i++) {
+                        data->in[i] = w83792d_read_value(client,
+                                                W83792D_REG_IN[i]);
+                        data->in_max[i] = w83792d_read_value(client,
+                                                W83792D_REG_IN_MAX[i]);
+                        data->in_min[i] = w83792d_read_value(client,
+                                                W83792D_REG_IN_MIN[i]);
+                }
+                data->low_bits[0] = w83792d_read_value(client,
+                                                W83792D_REG_LOW_BITS1);
+                data->low_bits[1] = w83792d_read_value(client,
+                                                W83792D_REG_LOW_BITS2);
+                for (i = 0; i < 7; i++) {
+                        /* Update the Fan measured value and limits */
+                        data->fan[i] = w83792d_read_value(client,
+                                                W83792D_REG_FAN[i]);
+                        data->fan_min[i] = w83792d_read_value(client,
+                                                W83792D_REG_FAN_MIN[i]);
+                        /* Update the PWM/DC Value and PWM/DC flag */
+                        pwm_array_tmp[i] = w83792d_read_value(client,
+                                                W83792D_REG_PWM[i]);
+                        data->pwm[i] = pwm_array_tmp[i] & 0x0f;
+                        data->pwm_mode[i] = (pwm_array_tmp[i] >> 7) & 0x01;
+                }
+                reg_tmp = w83792d_read_value(client, W83792D_REG_FAN_CFG);
+                data->pwmenable[0] = reg_tmp & 0x03;
+                data->pwmenable[1] = (reg_tmp>>2) & 0x03;
+                data->pwmenable[2] = (reg_tmp>>4) & 0x03;
+                for (i = 0; i < 3; i++) {
+                        data->temp1[i] = w83792d_read_value(client,
+                                                        W83792D_REG_TEMP1[i]);
+                }
+                for (i = 0; i < 2; i++) {
+                        for (j = 0; j < 6; j++) {
+                                data->temp_add[i][j] = w83792d_read_value(
+                                        client,W83792D_REG_TEMP_ADD[i][j]);
+                        }
+                }
+                /* Update the Fan Divisor */
+                for (i = 0; i < 4; i++) {
+                        reg_array_tmp[i] = w83792d_read_value(client,
+                                                        W83792D_REG_FAN_DIV[i]);
+                }
+                data->fan_div[0] = reg_array_tmp[0] & 0x07;
+                data->fan_div[1] = (reg_array_tmp[0] >> 4) & 0x07;
+                data->fan_div[2] = reg_array_tmp[1] & 0x07;
+                data->fan_div[3] = (reg_array_tmp[1] >> 4) & 0x07;
+                data->fan_div[4] = reg_array_tmp[2] & 0x07;
+                data->fan_div[5] = (reg_array_tmp[2] >> 4) & 0x07;
+                data->fan_div[6] = reg_array_tmp[3] & 0x07;
+                /* Update the realtime status */
+                data->alarms = w83792d_read_value(client, W83792D_REG_ALARM1) +
+                        (w83792d_read_value(client, W83792D_REG_ALARM2) << 8) +
+                        (w83792d_read_value(client, W83792D_REG_ALARM3) << 16);
+                /* Update CaseOpen status and it's CLR_CHS. */
+                data->chassis = (w83792d_read_value(client,
+                        W83792D_REG_CHASSIS) >> 5) & 0x01;
+                data->chassis_clear = (w83792d_read_value(client,
+                        W83792D_REG_CHASSIS_CLR) >> 7) & 0x01;
+                /* Update Thermal Cruise/Smart Fan I target value */
+                for (i = 0; i < 3; i++) {
+                        data->thermal_cruise[i] =
+                                w83792d_read_value(client,
+                                W83792D_REG_THERMAL[i]) & 0x7f;
+                }
+                /* Update Smart Fan I/II tolerance */
+                reg_tmp = w83792d_read_value(client, W83792D_REG_TOLERANCE[0]);
+                data->tolerance[0] = reg_tmp & 0x0f;
+                data->tolerance[1] = (reg_tmp >> 4) & 0x0f;
+                data->tolerance[2] = w83792d_read_value(client,
+                                        W83792D_REG_TOLERANCE[2]) & 0x0f;
+                /* Update Smart Fan II temperature points */
+                for (i = 0; i < 3; i++) {
+                        for (j = 0; j < 4; j++) {
+                                data->sf2_points[i][j] = w83792d_read_value(
+                                        client,W83792D_REG_POINTS[i][j]) & 0x7f;
+                        }
+                }
+                /* Update Smart Fan II duty cycle levels */
+                for (i = 0; i < 3; i++) {
+                        reg_tmp = w83792d_read_value(client,
+                                                W83792D_REG_LEVELS[i][0]);
+                        data->sf2_levels[i][0] = reg_tmp & 0x0f;
+                        data->sf2_levels[i][1] = (reg_tmp >> 4) & 0x0f;
+                        reg_tmp = w83792d_read_value(client,
+                                                W83792D_REG_LEVELS[i][2]);
+                        data->sf2_levels[i][2] = (reg_tmp >> 4) & 0x0f;
+                        data->sf2_levels[i][3] = reg_tmp & 0x0f;
+                }
+                data->last_updated = jiffies;
+                data->valid = 1;
+        }
+        up(&data->update_lock);
+#ifdef DEBUG
+        w83792d_print_debug(data, dev);
+#endif
+        return data;
+}
+#ifdef DEBUG
+static void w83792d_print_debug(struct w83792d_data *data, struct device *dev)
+{
+        int i=0, j=0;
+        dev_dbg(dev, "==========The following is the debug message...========\n");
+        dev_dbg(dev, "9 set of Voltages: =====>\n");
+        for (i=0; i<9; i++) {
+                dev_dbg(dev, "vin[%d] is: 0x%x\n", i, data->in[i]);
+                dev_dbg(dev, "vin[%d] max is: 0x%x\n", i, data->in_max[i]);
+                dev_dbg(dev, "vin[%d] min is: 0x%x\n", i, data->in_min[i]);
+        }
+        dev_dbg(dev, "Low Bit1 is: 0x%x\n", data->low_bits[0]);
+        dev_dbg(dev, "Low Bit2 is: 0x%x\n", data->low_bits[1]);
+        dev_dbg(dev, "7 set of Fan Counts and Duty Cycles: =====>\n");
+        for (i=0; i<7; i++) {
+                dev_dbg(dev, "fan[%d] is: 0x%x\n", i, data->fan[i]);
+                dev_dbg(dev, "fan[%d] min is: 0x%x\n", i, data->fan_min[i]);
+                dev_dbg(dev, "pwm[%d]     is: 0x%x\n", i, data->pwm[i]);
+                dev_dbg(dev, "pwm_mode[%d] is: 0x%x\n", i, data->pwm_mode[i]);
+        }
+        dev_dbg(dev, "3 set of Temperatures: =====>\n");
+        for (i=0; i<3; i++) {
+                dev_dbg(dev, "temp1[%d] is: 0x%x\n", i, data->temp1[i]);
+        }
+        for (i=0; i<2; i++) {
+                for (j=0; j<6; j++) {
+                        dev_dbg(dev, "temp_add[%d][%d] is: 0x%x\n", i, j,
+                                                        data->temp_add[i][j]);
+                }
+        }
+        for (i=0; i<7; i++) {
+                dev_dbg(dev, "fan_div[%d] is: 0x%x\n", i, data->fan_div[i]);
+        }
+        dev_dbg(dev, "==========End of the debug message...==================\n");
+        dev_dbg(dev, "\n");
+}
+#endif
+static int __init
+sensors_w83792d_init(void)
+{
+        return i2c_add_driver(&w83792d_driver);
+}
+static void __exit
+sensors_w83792d_exit(void)
+{
+        i2c_del_driver(&w83792d_driver);
+}
+MODULE_AUTHOR("Chunhao Huang @ Winbond <DZShen@Winbond.com.tw>");
+MODULE_DESCRIPTION("W83792AD/D driver for linux-2.6");
+MODULE_LICENSE("GPL");
+module_init(sensors_w83792d_init);
+module_exit(sensors_w83792d_exit);
diff --git a/drivers/hwmon/w83l785ts.c b/drivers/hwmon/w83l785ts.c
index 4469d52aba4c..133e34ab1d0a 100644
--- a/drivers/hwmon/w83l785ts.c
+++ b/drivers/hwmon/w83l785ts.c
@@ -36,7 +36,8 @@
 #include <linux/slab.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <linux/hwmon.h>
+#include <linux/err.h>
 /* How many retries on register read error */
 #define MAX_RETRIES     5
@@ -47,13 +48,12 @@
 */
 static unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /*
 * Insmod parameters
 */
-SENSORS_INSMOD_1(w83l785ts);
+I2C_CLIENT_INSMOD_1(w83l785ts);
 /*
 * The W83L785TS-S registers
@@ -105,6 +105,7 @@ static struct i2c_driver w83l785ts_driver = {
 struct w83l785ts_data {
        struct i2c_client client;
+        struct class_device *class_dev;
        struct semaphore update_lock;
        char valid; /* zero until following fields are valid */
        unsigned long last_updated; /* in jiffies */
@@ -140,7 +141,7 @@ static int w83l785ts_attach_adapter(struct i2c_adapter *adapter)
 {
        if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
-        return i2c_detect(adapter, &addr_data, w83l785ts_detect);
+        return i2c_probe(adapter, &addr_data, w83l785ts_detect);
 }
 /*
@@ -239,11 +240,19 @@ static int w83l785ts_detect(struct i2c_adapter *adapter, int address, int kind)
         */
        /* Register sysfs hooks */
+        data->class_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->class_dev)) {
+                err = PTR_ERR(data->class_dev);
+                goto exit_detach;
+        }
        device_create_file(&new_client->dev, &dev_attr_temp1_input);
        device_create_file(&new_client->dev, &dev_attr_temp1_max);
        return 0;
+exit_detach:
+        i2c_detach_client(new_client);
 exit_free:
        kfree(data);
 exit:
@@ -252,15 +261,15 @@ exit:
 static int w83l785ts_detach_client(struct i2c_client *client)
 {
+        struct w83l785ts_data *data = i2c_get_clientdata(client);
        int err;
-        if ((err = i2c_detach_client(client))) {
+        hwmon_device_unregister(data->class_dev);
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
+        if ((err = i2c_detach_client(client)))
                return err;
-        }
-        kfree(i2c_get_clientdata(client));
+        kfree(data);
        return 0;
 }
diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index cd170395a8c7..71c5a854ac5d 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -4,12 +4,8 @@
 obj-$(CONFIG_I2C)               += i2c-core.o
 obj-$(CONFIG_I2C_CHARDEV)       += i2c-dev.o
-obj-$(CONFIG_I2C_SENSOR)        += i2c-sensor.o
 obj-y                           += busses/ chips/ algos/
-i2c-sensor-objs := i2c-sensor-detect.o i2c-sensor-vid.o
 ifeq ($(CONFIG_I2C_DEBUG_CORE),y)
 EXTRA_CFLAGS += -DDEBUG
 endif
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index fb5b732238ed..df05df1a0ef6 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -519,8 +519,6 @@ static u32 bit_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 static struct i2c_algorithm i2c_bit_algo = {
-        .name           = "Bit-shift algorithm",
-        .id             = I2C_ALGO_BIT,
        .master_xfer    = bit_xfer,
        .functionality  = bit_func,
 };
@@ -541,8 +539,6 @@ int i2c_bit_add_bus(struct i2c_adapter *adap)
        DEB2(dev_dbg(&adap->dev, "hw routines registered.\n"));
        /* register new adapter to i2c module... */
-        adap->id |= i2c_bit_algo.id;
        adap->algo = &i2c_bit_algo;
        adap->timeout = 100;    /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c
index e6cae39f47aa..2db7bfc85225 100644
--- a/drivers/i2c/algos/i2c-algo-ite.c
+++ b/drivers/i2c/algos/i2c-algo-ite.c
@@ -713,8 +713,6 @@ static u32 iic_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 static struct i2c_algorithm iic_algo = {
-        .name           = "ITE IIC algorithm",
-        .id             = I2C_ALGO_IIC,
        .master_xfer    = iic_xfer,
        .algo_control   = algo_control, /* ioctl */
        .functionality  = iic_func,
@@ -738,8 +736,6 @@ int i2c_iic_add_bus(struct i2c_adapter *adap)
                    adap->name));
        /* register new adapter to i2c module... */
-        adap->id |= iic_algo.id;
        adap->algo = &iic_algo;
        adap->timeout = 100;    /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index cc3a952401f2..beb10edfe9c1 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -187,12 +187,14 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
        int numbytes = 0;
        int state;
        int ret;
+        int timeout = 100;
-        state = pca_status(adap);
+        while ((state = pca_status(adap)) != 0xf8 && timeout--) {
-        if ( state != 0xF8 ) {
+                msleep(10);
-                dev_dbg(&i2c_adap->dev, "bus is not idle. status is %#04x\n", state );
+        }
-                /* FIXME: what to do. Force stop ? */
+        if (state != 0xf8) {
-                return -EREMOTEIO;
+                dev_dbg(&i2c_adap->dev, "bus is not idle. status is %#04x\n", state);
+                return -EIO;
        }
        DEB1("{{{ XFER %d messages\n", num);
@@ -354,8 +356,6 @@ static int pca_init(struct i2c_algo_pca_data *adap)
 }
 static struct i2c_algorithm pca_algo = {
-        .name           = "PCA9564 algorithm",
-        .id             = I2C_ALGO_PCA,
        .master_xfer    = pca_xfer,
        .functionality  = pca_func,
 };
@@ -369,8 +369,6 @@ int i2c_pca_add_bus(struct i2c_adapter *adap)
        int rval;
        /* register new adapter to i2c module... */
-        adap->id |= pca_algo.id;
        adap->algo = &pca_algo;
        adap->timeout = 100;            /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index 8d087dac32af..6e498df1f717 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -459,8 +459,6 @@ static u32 pcf_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 static struct i2c_algorithm pcf_algo = {
-        .name           = "PCF8584 algorithm",
-        .id             = I2C_ALGO_PCF,
        .master_xfer    = pcf_xfer,
        .functionality  = pcf_func,
 };
@@ -476,8 +474,6 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap)
        DEB2(dev_dbg(&adap->dev, "hw routines registered.\n"));
        /* register new adapter to i2c module... */
-        adap->id |= pcf_algo.id;
        adap->algo = &pcf_algo;
        adap->timeout = 100;            /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c
index 422721b241e5..932c4fa86c73 100644
--- a/drivers/i2c/algos/i2c-algo-sgi.c
+++ b/drivers/i2c/algos/i2c-algo-sgi.c
@@ -149,7 +149,7 @@ static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
                        err = i2c_write(adap, p->buf, p->len);
        }
-        return err;
+        return (err < 0) ? err : i;
 }
 static u32 sgi_func(struct i2c_adapter *adap)
@@ -158,8 +158,6 @@ static u32 sgi_func(struct i2c_adapter *adap)
 }
 static struct i2c_algorithm sgi_algo = {
-        .name           = "SGI algorithm",
-        .id             = I2C_ALGO_SGI,
        .master_xfer    = sgi_xfer,
        .functionality  = sgi_func,
 };
@@ -169,7 +167,6 @@ static struct i2c_algorithm sgi_algo = {
 */
 int i2c_sgi_add_bus(struct i2c_adapter *adap)
 {
-        adap->id |= sgi_algo.id;
        adap->algo = &sgi_algo;
        return i2c_add_adapter(adap);
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c
index f2785499237b..8ed5ad12552f 100644
--- a/drivers/i2c/algos/i2c-algo-sibyte.c
+++ b/drivers/i2c/algos/i2c-algo-sibyte.c
@@ -135,8 +135,6 @@ static u32 bit_func(struct i2c_adapter *adap)
 /* -----exported algorithm data: -------------------------------------  */
 static struct i2c_algorithm i2c_sibyte_algo = {
-        .name           = "SiByte algorithm",
-        .id             = I2C_ALGO_SIBYTE,
        .smbus_xfer     = smbus_xfer,
        .algo_control   = algo_control, /* ioctl */
        .functionality  = bit_func,
@@ -151,8 +149,6 @@ int i2c_sibyte_add_bus(struct i2c_adapter *i2c_adap, int speed)
        struct i2c_algo_sibyte_data *adap = i2c_adap->algo_data;
        /* register new adapter to i2c module... */
-        i2c_adap->id |= i2c_sibyte_algo.id;
        i2c_adap->algo = &i2c_sibyte_algo;
        
        /* Set the frequency to 100 kHz */
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 916ba5e40a96..6e9da1372225 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -182,14 +182,8 @@ config I2C_IOP3XX
          will be called i2c-iop3xx.
 config I2C_ISA
-        tristate "ISA Bus support"
+        tristate
        depends on I2C
-        help
-          If you say yes to this option, support will be included for i2c
-          interfaces that are on the ISA bus.
-          This driver can also be built as a module.  If so, the module
-          will be called i2c-isa.
 config I2C_ITE
        tristate "ITE I2C Adapter"
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index f634a0780cf0..f021acd2674e 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -472,8 +472,6 @@ static u32 ali1535_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-i2c SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
        .smbus_xfer     = ali1535_access,
        .functionality  = ali1535_func,
 };
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index fdd881aee618..86947504aea1 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -366,8 +366,6 @@ static void ali1563_shutdown(struct pci_dev *dev)
 }
 static struct i2c_algorithm ali1563_algorithm = {
-        .name           = "Non-i2c SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
        .smbus_xfer     = ali1563_access,
        .functionality  = ali1563_func,
 };
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 0f781a1a3323..b3f50bff39a0 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -462,8 +462,6 @@ static u32 ali15x3_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
        .smbus_xfer     = ali15x3_access,
        .functionality  = ali15x3_func,
 };
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 6347ebc6fb53..6ad0603384b8 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -295,8 +295,6 @@ static u32 amd756_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
        .smbus_xfer     = amd756_access,
        .functionality  = amd756_func,
 };
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c
index d6644481d2a0..45ea24ba14d5 100644
--- a/drivers/i2c/busses/i2c-amd8111.c
+++ b/drivers/i2c/busses/i2c-amd8111.c
@@ -323,8 +323,6 @@ static u32 amd8111_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm smbus_algorithm = {
-        .name = "Non-I2C SMBus 2.0 adapter",
-        .id = I2C_ALGO_SMBUS,
        .smbus_xfer = amd8111_access,
        .functionality = amd8111_func,
 };
diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c
index a7ff112e49bf..d06edce03bf4 100644
--- a/drivers/i2c/busses/i2c-au1550.c
+++ b/drivers/i2c/busses/i2c-au1550.c
@@ -283,8 +283,6 @@ au1550_func(struct i2c_adapter *adap)
 }
 static struct i2c_algorithm au1550_algo = {
-        .name           = "Au1550 algorithm",
-        .id             = I2C_ALGO_AU1550,
        .master_xfer    = au1550_xfer,
        .functionality  = au1550_func,
 };
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 1ab41313ce51..709beab76609 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -535,8 +535,6 @@ static u32 i801_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
        .smbus_xfer     = i801_access,
        .functionality  = i801_func,
 };
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 93ca36dc777e..a3ed9590f028 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -627,8 +627,6 @@ static u32 iic_func(struct i2c_adapter *adap)
 }
 static struct i2c_algorithm iic_algo = {
-        .name           = "IBM IIC algorithm",
-        .id             = I2C_ALGO_OCP,
        .master_xfer    = iic_xfer,
        .functionality  = iic_func
 };
@@ -727,7 +725,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
        adap = &dev->adap;
        strcpy(adap->name, "IBM IIC");
        i2c_set_adapdata(adap, dev);
-        adap->id = I2C_HW_OCP | iic_algo.id;
+        adap->id = I2C_HW_OCP;
        adap->algo = &iic_algo;
        adap->client_register = NULL;
        adap->client_unregister = NULL;
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index 6b682e903f09..7bd9102db701 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -399,8 +399,6 @@ iop3xx_i2c_func(struct i2c_adapter *adap)
 }
 static struct i2c_algorithm iop3xx_i2c_algo = {
-        .name           = "IOP3xx I2C algorithm",
-        .id             = I2C_ALGO_IOP3XX,
        .master_xfer    = iop3xx_i2c_master_xfer,
        .algo_control   = iop3xx_i2c_algo_control,
        .functionality  = iop3xx_i2c_func,
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index 00e7f7157b75..bdc6806dafae 100644
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -1,6 +1,8 @@
 /*
-    i2c-isa.c - Part of lm_sensors, Linux kernel modules for hardware
+    i2c-isa.c - an i2c-core-like thing for ISA hardware monitoring chips
-            monitoring
+    Copyright (C) 2005  Jean Delvare <khali@linux-fr.org>
+    Based on the i2c-isa pseudo-adapter from the lm_sensors project
    Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl> 
    This program is free software; you can redistribute it and/or modify
@@ -18,30 +20,36 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-/* This implements an i2c algorithm/adapter for ISA bus. Not that this is
+/* This implements an i2c-core-like thing for ISA hardware monitoring
-   on first sight very useful; almost no functionality is preserved.
+   chips. Such chips are linked to the i2c subsystem for historical
-   Except that it makes writing drivers for chips which can be on both
+   reasons (because the early ISA hardware monitoring chips such as the
-   the SMBus and the ISA bus very much easier. See lm78.c for an example
+   LM78 had both an I2C and an ISA interface). They used to be
-   of this. */
+   registered with the main i2c-core, but as a first step in the
+   direction of a clean separation between I2C and ISA chip drivers,
+   we now have this separate core for ISA ones. It is significantly
+   more simple than the real one, of course, because we don't have to
+   handle multiple busses: there is only one (fake) ISA adapter.
+   It is worth noting that we still rely on i2c-core for some things
+   at the moment - but hopefully this won't last. */
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
+#include <linux/i2c-isa.h>
 static u32 isa_func(struct i2c_adapter *adapter);
 /* This is the actual algorithm we define */
 static struct i2c_algorithm isa_algorithm = {
-        .name           = "ISA bus algorithm",
-        .id             = I2C_ALGO_ISA,
        .functionality  = isa_func,
 };
 /* There can only be one... */
 static struct i2c_adapter isa_adapter = {
        .owner          = THIS_MODULE,
+        .id             = I2C_HW_ISA,
        .class          = I2C_CLASS_HWMON,
        .algo           = &isa_algorithm,
        .name           = "ISA main adapter",
@@ -53,17 +61,146 @@ static u32 isa_func(struct i2c_adapter *adapter)
        return 0;
 }
+/* Copied from i2c-core */
+static ssize_t show_adapter_name(struct device *dev,
+                struct device_attribute *attr, char *buf)
+{
+        struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
+        return sprintf(buf, "%s\n", adap->name);
+}
+static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
+static int i2c_isa_device_probe(struct device *dev)
+{
+        return -ENODEV;
+}
+static int i2c_isa_device_remove(struct device *dev)
+{
+        return 0;
+}
+/* We implement an interface which resembles i2c_{add,del}_driver,
+   but for i2c-isa drivers. We don't have to remember and handle lists
+   of drivers and adapters so this is much more simple, of course. */
+int i2c_isa_add_driver(struct i2c_driver *driver)
+{
+        int res;
+        /* Add the driver to the list of i2c drivers in the driver core */
+        driver->driver.name = driver->name;
+        driver->driver.bus = &i2c_bus_type;
+        driver->driver.probe = i2c_isa_device_probe;
+        driver->driver.remove = i2c_isa_device_remove;
+        res = driver_register(&driver->driver);
+        if (res)
+                return res;
+        dev_dbg(&isa_adapter.dev, "Driver %s registered\n", driver->name);
+        /* Now look for clients */
+        driver->attach_adapter(&isa_adapter);
+        return 0;
+}
+int i2c_isa_del_driver(struct i2c_driver *driver)
+{
+        struct list_head *item, *_n;
+        struct i2c_client *client;
+        int res;
+        /* Detach all clients belonging to this one driver */
+        list_for_each_safe(item, _n, &isa_adapter.clients) {
+                client = list_entry(item, struct i2c_client, list);
+                if (client->driver != driver)
+                        continue;
+                dev_dbg(&isa_adapter.dev, "Detaching client %s at 0x%x\n",
+                        client->name, client->addr);
+                if ((res = driver->detach_client(client))) {
+                        dev_err(&isa_adapter.dev, "Failed, driver "
+                                "%s not unregistered!\n",
+                                driver->name);
+                        return res;
+                }
+        }
+        /* Get the driver off the core list */
+        driver_unregister(&driver->driver);
+        dev_dbg(&isa_adapter.dev, "Driver %s unregistered\n", driver->name);
+        return 0;
+}
 static int __init i2c_isa_init(void)
 {
-        return i2c_add_adapter(&isa_adapter);
+        init_MUTEX(&isa_adapter.clist_lock);
+        INIT_LIST_HEAD(&isa_adapter.clients);
+        isa_adapter.nr = ANY_I2C_ISA_BUS;
+        isa_adapter.dev.parent = &platform_bus;
+        sprintf(isa_adapter.dev.bus_id, "i2c-%d", isa_adapter.nr);
+        isa_adapter.dev.driver = &i2c_adapter_driver;
+        isa_adapter.dev.release = &i2c_adapter_dev_release;
+        device_register(&isa_adapter.dev);
+        device_create_file(&isa_adapter.dev, &dev_attr_name);
+        /* Add this adapter to the i2c_adapter class */
+        memset(&isa_adapter.class_dev, 0x00, sizeof(struct class_device));
+        isa_adapter.class_dev.dev = &isa_adapter.dev;
+        isa_adapter.class_dev.class = &i2c_adapter_class;
+        strlcpy(isa_adapter.class_dev.class_id, isa_adapter.dev.bus_id,
+                BUS_ID_SIZE);
+        class_device_register(&isa_adapter.class_dev);
+        dev_dbg(&isa_adapter.dev, "%s registered\n", isa_adapter.name);
+        return 0;
 }
 static void __exit i2c_isa_exit(void)
 {
-        i2c_del_adapter(&isa_adapter);
+#ifdef DEBUG
+        struct list_head  *item, *_n;
+        struct i2c_client *client = NULL;
+#endif
+        /* There should be no more active client */
+#ifdef DEBUG
+        dev_dbg(&isa_adapter.dev, "Looking for clients\n");
+        list_for_each_safe(item, _n, &isa_adapter.clients) {
+                client = list_entry(item, struct i2c_client, list);
+                dev_err(&isa_adapter.dev, "Driver %s still has an active "
+                        "ISA client at 0x%x\n", client->driver->name,
+                        client->addr);
+        }
+        if (client != NULL)
+                return;
+#endif
+        /* Clean up the sysfs representation */
+        dev_dbg(&isa_adapter.dev, "Unregistering from sysfs\n");
+        init_completion(&isa_adapter.dev_released);
+        init_completion(&isa_adapter.class_dev_released);
+        class_device_unregister(&isa_adapter.class_dev);
+        device_remove_file(&isa_adapter.dev, &dev_attr_name);
+        device_unregister(&isa_adapter.dev);
+        /* Wait for sysfs to drop all references */
+        dev_dbg(&isa_adapter.dev, "Waiting for sysfs completion\n");
+        wait_for_completion(&isa_adapter.dev_released);
+        wait_for_completion(&isa_adapter.class_dev_released);
+        dev_dbg(&isa_adapter.dev, "%s unregistered\n", isa_adapter.name);
 }
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>");
+EXPORT_SYMBOL(i2c_isa_add_driver);
+EXPORT_SYMBOL(i2c_isa_del_driver);
+MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
 MODULE_DESCRIPTION("ISA bus access through i2c");
 MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/busses/i2c-keywest.c b/drivers/i2c/busses/i2c-keywest.c
index 94ae808314f7..37b49c2daf5f 100644
--- a/drivers/i2c/busses/i2c-keywest.c
+++ b/drivers/i2c/busses/i2c-keywest.c
@@ -87,12 +87,9 @@ static const char *__kw_state_names[] = {
 };
 #endif /* DEBUG */
-static int probe;
 MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
 MODULE_DESCRIPTION("I2C driver for Apple's Keywest");
 MODULE_LICENSE("GPL");
-module_param(probe, bool, 0);
 #ifdef POLLED_MODE
 /* Don't schedule, the g5 fan controller is too
@@ -498,8 +495,6 @@ keywest_func(struct i2c_adapter * adapter)
 /* For now, we only handle combined mode (smbus) */
 static struct i2c_algorithm keywest_algorithm = {
-        .name           = "Keywest i2c",
-        .id             = I2C_ALGO_SMBUS,
        .smbus_xfer     = keywest_smbus_xfer,
        .master_xfer    = keywest_xfer,
        .functionality  = keywest_func,
@@ -621,7 +616,6 @@ create_iface(struct device_node *np, struct device *dev)
                sprintf(chan->adapter.name, "%s %d", np->parent->name, i);
                chan->iface = iface;
                chan->chan_no = i;
-                chan->adapter.id = I2C_ALGO_SMBUS;
                chan->adapter.algo = &keywest_algorithm;
                chan->adapter.algo_data = NULL;
                chan->adapter.client_register = NULL;
@@ -635,15 +629,6 @@ create_iface(struct device_node *np, struct device *dev)
                                chan->adapter.name);
                        i2c_set_adapdata(&chan->adapter, NULL);
                }
-                if (probe) {
-                        printk("Probe: ");
-                        for (addr = 0x00; addr <= 0x7f; addr++) {
-                                if (i2c_smbus_xfer(&chan->adapter,addr,
-                                    0,0,0,I2C_SMBUS_QUICK,NULL) >= 0)
-                                        printk("%02x ", addr);
-                        }
-                        printk("\n");
-                }
        }
        printk(KERN_INFO "Found KeyWest i2c on \"%s\", %d channel%s, stepping: %d bits\n",
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 9ad3e9262e8a..f065583ddcf1 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -272,8 +272,6 @@ static u32 mpc_functionality(struct i2c_adapter *adap)
 }
 static struct i2c_algorithm mpc_algo = {
-        .name = "MPC algorithm",
-        .id = I2C_ALGO_MPC107,
        .master_xfer = mpc_xfer,
        .functionality = mpc_functionality,
 };
@@ -281,7 +279,7 @@ static struct i2c_algorithm mpc_algo = {
 static struct i2c_adapter mpc_ops = {
        .owner = THIS_MODULE,
        .name = "MPC adapter",
-        .id = I2C_ALGO_MPC107 | I2C_HW_MPC107,
+        .id = I2C_HW_MPC107,
        .algo = &mpc_algo,
        .class = I2C_CLASS_HWMON,
        .timeout = 1,
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 5b852782d2f5..99abca45fece 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -423,18 +423,16 @@ static int
 mv64xxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
 {
        struct mv64xxx_i2c_data *drv_data = i2c_get_adapdata(adap);
-        int     i, rc = 0;
+        int     i, rc;
        for (i=0; i<num; i++)
-                if ((rc = mv64xxx_i2c_execute_msg(drv_data, &msgs[i])) != 0)
+                if ((rc = mv64xxx_i2c_execute_msg(drv_data, &msgs[i])) < 0)
-                        break;
+                        return rc;
-        return rc;
+        return num;
 }
 static struct i2c_algorithm mv64xxx_i2c_algo = {
-        .name = MV64XXX_I2C_CTLR_NAME " algorithm",
-        .id = I2C_ALGO_MV64XXX,
        .master_xfer = mv64xxx_i2c_xfer,
        .functionality = mv64xxx_i2c_functionality,
 };
@@ -523,7 +521,7 @@ mv64xxx_i2c_probe(struct device *dev)
        drv_data->freq_m = pdata->freq_m;
        drv_data->freq_n = pdata->freq_n;
        drv_data->irq = platform_get_irq(pd, 0);
-        drv_data->adapter.id = I2C_ALGO_MV64XXX | I2C_HW_MV64XXX;
+        drv_data->adapter.id = I2C_HW_MV64XXX;
        drv_data->adapter.algo = &mv64xxx_i2c_algo;
        drv_data->adapter.owner = THIS_MODULE;
        drv_data->adapter.class = I2C_CLASS_HWMON;
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 74eb89aa9350..e0b7a913431e 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -110,8 +110,6 @@ static u32 nforce2_func(struct i2c_adapter *adapter);
 static struct i2c_algorithm smbus_algorithm = {
-        .name = "Non-I2C SMBus adapter",
-        .id = I2C_ALGO_SMBUS,
        .smbus_xfer = nforce2_access,
        .functionality = nforce2_func,
 };
@@ -131,7 +129,6 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
        struct nforce2_smbus *smbus = adap->algo_data;
        unsigned char protocol, pec, temp;
        unsigned char len = 0; /* to keep the compiler quiet */
-        int timeout = 0;
        int i;
        protocol = (read_write == I2C_SMBUS_READ) ? NVIDIA_SMB_PRTCL_READ :
@@ -191,29 +188,10 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
                case I2C_SMBUS_PROC_CALL:
                        dev_err(&adap->dev, "I2C_SMBUS_PROC_CALL not supported!\n");
                        return -1;
-                        /*
-                        outb_p(command, NVIDIA_SMB_CMD);
-                        outb_p(data->word, NVIDIA_SMB_DATA);
-                        outb_p(data->word >> 8, NVIDIA_SMB_DATA + 1);
-                        protocol = NVIDIA_SMB_PRTCL_PROC_CALL | pec;
-                        read_write = I2C_SMBUS_READ;
-                        break;
-                         */
                case I2C_SMBUS_BLOCK_PROC_CALL:
                        dev_err(&adap->dev, "I2C_SMBUS_BLOCK_PROC_CALL not supported!\n");
                        return -1;
-                        /*
-                        protocol |= pec;
-                        len = min_t(u8, data->block[0], 31);
-                        outb_p(command, NVIDIA_SMB_CMD);
-                        outb_p(len, NVIDIA_SMB_BCNT);
-                        for (i = 0; i < len; i++)
-                                outb_p(data->block[i + 1], NVIDIA_SMB_DATA + i);
-                        protocol = NVIDIA_SMB_PRTCL_BLOCK_PROC_CALL | pec;
-                        read_write = I2C_SMBUS_READ;
-                        break;
-                        */
                case I2C_SMBUS_WORD_DATA_PEC:
                case I2C_SMBUS_BLOCK_DATA_PEC:
@@ -232,12 +210,6 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
        temp = inb_p(NVIDIA_SMB_STS);
-#if 0
-        do {
-                i2c_do_pause(1);
-                temp = inb_p(NVIDIA_SMB_STS);
-        } while (((temp & NVIDIA_SMB_STS_DONE) == 0) && (timeout++ < MAX_TIMEOUT));
-#endif
        if (~temp & NVIDIA_SMB_STS_DONE) {
                udelay(500);
                temp = inb_p(NVIDIA_SMB_STS);
@@ -247,9 +219,10 @@ static s32 nforce2_access(struct i2c_adapter * adap, u16 addr,
                temp = inb_p(NVIDIA_SMB_STS);
        }
-        if ((timeout >= MAX_TIMEOUT) || (~temp & NVIDIA_SMB_STS_DONE)
+        if ((~temp & NVIDIA_SMB_STS_DONE) || (temp & NVIDIA_SMB_STS_STATUS)) {
-                || (temp & NVIDIA_SMB_STS_STATUS))
+                dev_dbg(&adap->dev, "SMBus Timeout! (0x%02x)\n", temp);
                return -1;
+        }
        if (read_write == I2C_SMBUS_WRITE)
                return 0;
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 6d34ee381ce1..6d48a4da7bed 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -399,8 +399,6 @@ static u32 piix4_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
        .smbus_xfer     = piix4_access,
        .functionality  = piix4_func,
 };
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index a3b38257cc3d..73a092fb0e7e 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -568,7 +568,6 @@ static u32 s3c24xx_i2c_func(struct i2c_adapter *adap)
 /* i2c bus registration info */
 static struct i2c_algorithm s3c24xx_i2c_algorithm = {
-        .name                   = "S3C2410-I2C-Algorithm",
        .master_xfer            = s3c24xx_i2c_xfer,
        .functionality          = s3c24xx_i2c_func,
 };
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index bbd5e4e52f09..080318d6f54b 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -357,8 +357,6 @@ static u32 sis5595_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
        .smbus_xfer     = sis5595_access,
        .functionality  = sis5595_func,
 };
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index f58455e7689e..86f0f448fa0b 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -448,8 +448,6 @@ exit:
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
        .smbus_xfer     = sis630_access,
        .functionality  = sis630_func,
 };
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index 6484792e23a1..ead2ff3cf60e 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -249,8 +249,6 @@ static u32 sis96x_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
        .smbus_xfer     = sis96x_access,
        .functionality  = sis96x_func,
 };
diff --git a/drivers/i2c/busses/i2c-stub.c b/drivers/i2c/busses/i2c-stub.c
index 00d94e886955..73f481e93a36 100644
--- a/drivers/i2c/busses/i2c-stub.c
+++ b/drivers/i2c/busses/i2c-stub.c
@@ -109,8 +109,6 @@ static u32 stub_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
        .functionality  = stub_func,
        .smbus_xfer     = stub_xfer,
 };
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 6b5008005c6f..99d209e0485a 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -286,8 +286,6 @@ static u32 vt596_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm smbus_algorithm = {
-        .name           = "Non-I2C SMBus adapter",
-        .id             = I2C_ALGO_SMBUS,
        .smbus_xfer     = vt596_access,
        .functionality  = vt596_func,
 };
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index a18bdd9aa7ba..a1d580e05361 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -395,8 +395,6 @@ static u32 scx200_acb_func(struct i2c_adapter *adapter)
 /* For now, we only handle combined mode (smbus) */
 static struct i2c_algorithm scx200_acb_algorithm = {
-        .name           = "NatSemi SCx200 ACCESS.bus",
-        .id             = I2C_ALGO_SMBUS,
        .smbus_xfer     = scx200_acb_smbus_xfer,
        .functionality  = scx200_acb_func,
 };
@@ -456,7 +454,7 @@ static int  __init scx200_acb_create(int base, int index)
        i2c_set_adapdata(adapter, iface);
        snprintf(adapter->name, I2C_NAME_SIZE, "SCx200 ACB%d", index);
        adapter->owner = THIS_MODULE;
-        adapter->id = I2C_ALGO_SMBUS;
+        adapter->id = I2C_HW_SMBUS_SCX200;
        adapter->algo = &scx200_acb_algorithm;
        adapter->class = I2C_CLASS_HWMON;
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index 43f70dbfc03f..6bd44a44cd28 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -2,17 +2,12 @@
 # Miscellaneous I2C chip drivers configuration
 #
-config I2C_SENSOR
-        tristate
-        default n
 menu "Miscellaneous I2C Chip support"
        depends on I2C
 config SENSORS_DS1337
        tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock"
        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for Dallas Semiconductor
          DS1337 and DS1339 real-time clock chips.
@@ -23,7 +18,6 @@ config SENSORS_DS1337
 config SENSORS_DS1374
        tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for Dallas Semiconductor
          DS1374 real-time clock chips.
@@ -34,7 +28,6 @@ config SENSORS_DS1374
 config SENSORS_EEPROM
        tristate "EEPROM reader"
        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get read-only access to the EEPROM data
          available on modern memory DIMMs and Sony Vaio laptops.  Such
@@ -46,7 +39,6 @@ config SENSORS_EEPROM
 config SENSORS_PCF8574
        tristate "Philips PCF8574 and PCF8574A"
        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for Philips PCF8574 and 
          PCF8574A chips.
@@ -67,7 +59,6 @@ config SENSORS_PCA9539
 config SENSORS_PCF8591
        tristate "Philips PCF8591"
        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for Philips PCF8591 chips.
@@ -77,7 +68,6 @@ config SENSORS_PCF8591
 config SENSORS_RTC8564
        tristate "Epson 8564 RTC chip"
        depends on I2C && EXPERIMENTAL
-        select I2C_SENSOR
        help
          If you say yes here you get support for the Epson 8564 RTC chip.
diff --git a/drivers/i2c/chips/ds1337.c b/drivers/i2c/chips/ds1337.c
index 82cf959989fd..9d3175c03395 100644
--- a/drivers/i2c/chips/ds1337.c
+++ b/drivers/i2c/chips/ds1337.c
@@ -17,7 +17,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 #include <linux/string.h>
 #include <linux/rtc.h>          /* get the user-level API */
 #include <linux/bcd.h>
@@ -39,9 +38,8 @@
 * Functions declaration
 */
 static unsigned short normal_i2c[] = { 0x68, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
-SENSORS_INSMOD_1(ds1337);
+I2C_CLIENT_INSMOD_1(ds1337);
 static int ds1337_attach_adapter(struct i2c_adapter *adapter);
 static int ds1337_detect(struct i2c_adapter *adapter, int address, int kind);
@@ -227,7 +225,7 @@ int ds1337_do_command(int bus, int cmd, void *arg)
 static int ds1337_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, ds1337_detect);
+        return i2c_probe(adapter, &addr_data, ds1337_detect);
 }
 /*
@@ -354,11 +352,8 @@ static int ds1337_detach_client(struct i2c_client *client)
        int err;
        struct ds1337_data *data = i2c_get_clientdata(client);
-        if ((err = i2c_detach_client(client))) {
+        if ((err = i2c_detach_client(client)))
-                dev_err(&client->dev, "Client deregistration failed, "
-                        "client not detached.\n");
                return err;
-        }
        list_del(&data->list);
        kfree(data);
diff --git a/drivers/i2c/chips/ds1374.c b/drivers/i2c/chips/ds1374.c
index a445736d8838..0936327a946d 100644
--- a/drivers/i2c/chips/ds1374.c
+++ b/drivers/i2c/chips/ds1374.c
@@ -53,7 +53,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c = normal_addr,
        .probe = ignore,
        .ignore = ignore,
-        .force = ignore,
 };
 static ulong ds1374_read_rtc(void)
@@ -166,7 +165,7 @@ static void ds1374_set_tlet(ulong arg)
                         "can't confirm time set from rtc chip\n");
 }
-ulong new_time;
+static ulong new_time;
 DECLARE_TASKLET_DISABLED(ds1374_tasklet, ds1374_set_tlet, (ulong) & new_time);
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index a2da31b0dd7b..d58403a47908 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -33,15 +33,13 @@
 #include <linux/sched.h>
 #include <linux/jiffies.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
                                        0x55, 0x56, 0x57, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_1(eeprom);
+I2C_CLIENT_INSMOD_1(eeprom);
 /* Size of EEPROM in bytes */
@@ -153,21 +151,16 @@ static struct bin_attribute eeprom_attr = {
 static int eeprom_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, eeprom_detect);
+        return i2c_probe(adapter, &addr_data, eeprom_detect);
 }
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int eeprom_detect(struct i2c_adapter *adapter, int address, int kind)
 {
        struct i2c_client *new_client;
        struct eeprom_data *data;
        int err = 0;
-        /* prevent 24RF08 corruption */
-        if (kind < 0)
-                i2c_smbus_xfer(adapter, address, 0, 0, 0,
-                               I2C_SMBUS_QUICK, NULL);
        /* There are three ways we can read the EEPROM data:
           (1) I2C block reads (faster, but unsupported by most adapters)
           (2) Consecutive byte reads (100% overhead)
@@ -231,10 +224,8 @@ static int eeprom_detach_client(struct i2c_client *client)
        int err;
        err = i2c_detach_client(client);
-        if (err) {
+        if (err)
-                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
                return err;
-        }
        kfree(i2c_get_clientdata(client));
diff --git a/drivers/i2c/chips/m41t00.c b/drivers/i2c/chips/m41t00.c
index 778d7e12859d..3f14528a52a9 100644
--- a/drivers/i2c/chips/m41t00.c
+++ b/drivers/i2c/chips/m41t00.c
@@ -42,7 +42,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_addr,
        .probe                  = ignore,
        .ignore                 = ignore,
-        .force                  = ignore,
 };
 ulong
@@ -145,7 +144,7 @@ m41t00_set_tlet(ulong arg)
        return;
 }
-ulong   new_time;
+static ulong    new_time;
 DECLARE_TASKLET_DISABLED(m41t00_tasklet, m41t00_set_tlet, (ulong)&new_time);
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index 0230375f72e5..9e1aeb69abf9 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -5,97 +5,60 @@
    Based on i2c/chips/eeprom.c
-    The MAX6875 has two EEPROM sections: config and user.
+    The MAX6875 has a bank of registers and two banks of EEPROM.
-    At reset, the config EEPROM is read into the registers.
+    Address ranges are defined as follows:
+     * 0x0000 - 0x0046 = configuration registers
+     * 0x8000 - 0x8046 = configuration EEPROM
+     * 0x8100 - 0x82FF = user EEPROM
-    This driver make 3 binary files available in sysfs:
+    This driver makes the user EEPROM available for read.
-      reg_config    - direct access to the registers
-      eeprom_config - acesses configuration eeprom space
-      eeprom_user   - free for application use
-    In our application, we put device serial & model numbers in user eeprom.
+    The registers & config EEPROM should be accessed via i2c-dev.
-    Notes:
+    The MAX6875 ignores the lowest address bit, so each chip responds to
-      1) The datasheet says that register 0x44 / EEPROM 0x8044 should NOT
+    two addresses - 0x50/0x51 and 0x52/0x53.
-         be overwritten, so the driver explicitly prevents that.
-      2) It's a good idea to keep the config (0x45) locked in config EEPROM.
+    Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read
-         You can temporarily enable config writes by changing register 0x45.
+    address, so this driver is destructive if loaded for the wrong EEPROM chip.
    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; version 2 of the License.
 */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
+#include <asm/semaphore.h>
-/* Addresses to scan */
+/* Do not scan - the MAX6875 access method will write to some EEPROM chips */
-/* No address scanned by default, as this could corrupt standard EEPROMS. */
 static unsigned short normal_i2c[] = {I2C_CLIENT_END};
-static unsigned int normal_isa[] = {I2C_CLIENT_ISA_END};
 /* Insmod parameters */
-SENSORS_INSMOD_1(max6875);
+I2C_CLIENT_INSMOD_1(max6875);
-/* this param will prevent 'accidental' writes to the eeprom */
-static int allow_write = 0;
-module_param(allow_write, int, 0);
-MODULE_PARM_DESC(allow_write,
-                 "Enable write access:\n"
-                 "*0: Read only\n"
-                 " 1: Read/Write access");
 /* The MAX6875 can only read/write 16 bytes at a time */
 #define SLICE_SIZE                      16
 #define SLICE_BITS                      4
-/* CONFIG EEPROM is at addresses 0x8000 - 0x8045, registers are at 0 - 0x45 */
-#define CONFIG_EEPROM_BASE              0x8000
-#define CONFIG_EEPROM_SIZE              0x0046
-#define CONFIG_EEPROM_SLICES            5
 /* USER EEPROM is at addresses 0x8100 - 0x82FF */
 #define USER_EEPROM_BASE                0x8100
 #define USER_EEPROM_SIZE                0x0200
 #define USER_EEPROM_SLICES              32
 /* MAX6875 commands */
-#define MAX6875_CMD_BLOCK_WRITE         0x83
+#define MAX6875_CMD_BLK_READ            0x84
-#define MAX6875_CMD_BLOCK_READ          0x84
-#define MAX6875_CMD_REBOOT              0x88
-enum max6875_area_type {
-        max6875_register_config=0,
-        max6875_eeprom_config,
-        max6875_eeprom_user,
-        max6857_max
-};
-struct eeprom_block {
-        enum max6875_area_type  type;
-        u8                      slices;
-        u32                     size;
-        u32                     valid;
-        u32                     base;
-        unsigned long           *updated;
-        u8                      *data;
-};
 /* Each client has this additional data */
 struct max6875_data {
        struct i2c_client       client;
        struct semaphore        update_lock;
-        struct eeprom_block     blocks[max6857_max];
-        /* the above structs point into the arrays below */
+        u32                     valid;
-        u8 data[USER_EEPROM_SIZE + (CONFIG_EEPROM_SIZE*2)];
+        u8                      data[USER_EEPROM_SIZE];
-        unsigned long last_updated[USER_EEPROM_SLICES + (CONFIG_EEPROM_SLICES*2)];
+        unsigned long           last_updated[USER_EEPROM_SLICES];
 };
 static int max6875_attach_adapter(struct i2c_adapter *adapter);
@@ -111,337 +74,160 @@ static struct i2c_driver max6875_driver = {
        .detach_client  = max6875_detach_client,
 };
-static int max6875_update_slice(struct i2c_client *client,
+static void max6875_update_slice(struct i2c_client *client, int slice)
-                                struct eeprom_block *blk,
-                                int slice)
 {
        struct max6875_data *data = i2c_get_clientdata(client);
-        int i, j, addr, count;
+        int i, j, addr;
-        u8 rdbuf[SLICE_SIZE];
+        u8 *buf;
-        int retval = 0;
-        if (slice >= blk->slices)
+        if (slice >= USER_EEPROM_SLICES)
-                return -1;
+                return;
        down(&data->update_lock);
-        if (!(blk->valid & (1 << slice)) ||
+        buf = &data->data[slice << SLICE_BITS];
-            (jiffies - blk->updated[slice] > 300 * HZ) ||
-            (jiffies < blk->updated[slice])) {
-                dev_dbg(&client->dev, "Starting eeprom update, slice %u, base %u\n",
-                        slice, blk->base);
-                addr = blk->base + (slice << SLICE_BITS);
+        if (!(data->valid & (1 << slice)) ||
-                count = blk->size - (slice << SLICE_BITS);
+            time_after(jiffies, data->last_updated[slice])) {
-                if (count > SLICE_SIZE) {
-                        count = SLICE_SIZE;
-                }
-                /* Preset the read address */
+                dev_dbg(&client->dev, "Starting update of slice %u\n", slice);
-                if (addr < 0x100) {
-                        /* select the register */
+                data->valid &= ~(1 << slice);
-                        if (i2c_smbus_write_byte(client, addr & 0xFF)) {
-                                dev_dbg(&client->dev, "max6875 register select has failed!\n");
+                addr = USER_EEPROM_BASE + (slice << SLICE_BITS);
-                                retval = -1;
-                                goto exit;
+                /* select the eeprom address */
-                        }
+                if (i2c_smbus_write_byte_data(client, addr >> 8, addr & 0xFF)) {
-                } else {
+                        dev_err(&client->dev, "address set failed\n");
-                        /* select the eeprom */
+                        goto exit_up;
-                        if (i2c_smbus_write_byte_data(client, addr >> 8, addr & 0xFF)) {
-                                dev_dbg(&client->dev, "max6875 address set has failed!\n");
-                                retval = -1;
-                                goto exit;
-                        }
                }
-                if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
+                if (i2c_check_functionality(client->adapter,
-                        if (i2c_smbus_read_i2c_block_data(client, MAX6875_CMD_BLOCK_READ,
+                                            I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
-                                                          rdbuf) != SLICE_SIZE)
+                        if (i2c_smbus_read_i2c_block_data(client,
-                        {
+                                                          MAX6875_CMD_BLK_READ,
-                                retval = -1;
+                                                          buf) != SLICE_SIZE) {
-                                goto exit;
+                                goto exit_up;
                        }
-                        memcpy(&blk->data[slice << SLICE_BITS], rdbuf, count);
                } else {
-                        for (i = 0; i < count; i++) {
+                        for (i = 0; i < SLICE_SIZE; i++) {
                                j = i2c_smbus_read_byte(client);
-                                if (j < 0)
+                                if (j < 0) {
-                                {
+                                        goto exit_up;
-                                        retval = -1;
-                                        goto exit;
                                }
-                                blk->data[(slice << SLICE_BITS) + i] = (u8) j;
+                                buf[i] = j;
                        }
                }
-                blk->updated[slice] = jiffies;
+                data->last_updated[slice] = jiffies;
-                blk->valid |= (1 << slice);
+                data->valid |= (1 << slice);
        }
-        exit:
+exit_up:
        up(&data->update_lock);
-        return retval;
 }
-static ssize_t max6875_read(struct kobject *kobj, char *buf, loff_t off, size_t count,
+static ssize_t max6875_read(struct kobject *kobj, char *buf, loff_t off,
-                            enum max6875_area_type area_type)
+                            size_t count)
 {
-        struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
+        struct i2c_client *client = kobj_to_i2c_client(kobj);
        struct max6875_data *data = i2c_get_clientdata(client);
-        struct eeprom_block *blk;
+        int slice, max_slice;
-        int slice;
-        blk = &data->blocks[area_type];
-        if (off > blk->size)
+        if (off > USER_EEPROM_SIZE)
                return 0;
-        if (off + count > blk->size)
-                count = blk->size - off;
-        /* Only refresh slices which contain requested bytes */
+        if (off + count > USER_EEPROM_SIZE)
-        for (slice = (off >> SLICE_BITS); slice <= ((off + count - 1) >> SLICE_BITS); slice++)
+                count = USER_EEPROM_SIZE - off;
-                max6875_update_slice(client, blk, slice);
-        memcpy(buf, &blk->data[off], count);
+        /* refresh slices which contain requested bytes */
+        max_slice = (off + count - 1) >> SLICE_BITS;
+        for (slice = (off >> SLICE_BITS); slice <= max_slice; slice++)
+                max6875_update_slice(client, slice);
-        return count;
+        memcpy(buf, &data->data[off], count);
-}
-static ssize_t max6875_user_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_read(kobj, buf, off, count, max6875_eeprom_user);
-}
-static ssize_t max6875_config_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_read(kobj, buf, off, count, max6875_eeprom_config);
-}
-static ssize_t max6875_cfgreg_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_read(kobj, buf, off, count, max6875_register_config);
-}
-static ssize_t max6875_write(struct kobject *kobj, char *buf, loff_t off, size_t count,
-                             enum max6875_area_type area_type)
-{
-        struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
-        struct max6875_data *data = i2c_get_clientdata(client);
-        struct eeprom_block *blk;
-        int slice, addr, retval;
-        ssize_t sent = 0;
-        blk = &data->blocks[area_type];
-        if (off > blk->size)
-                return 0;
-        if ((off + count) > blk->size)
-                count = blk->size - off;
-        if (down_interruptible(&data->update_lock))
-                return -EAGAIN;
-        /* writing to a register is done with i2c_smbus_write_byte_data() */
-        if (blk->type == max6875_register_config) {
-                for (sent = 0; sent < count; sent++) {
-                        addr = off + sent;
-                        if (addr == 0x44)
-                                continue;
-                        retval = i2c_smbus_write_byte_data(client, addr, buf[sent]);
-                }
-        } else {
-                int cmd, val;
-                /* We are writing to EEPROM */
-                for (sent = 0; sent < count; sent++) {
-                        addr = blk->base + off + sent;
-                        cmd = addr >> 8;
-                        val = (addr & 0xff) | (buf[sent] << 8); // reversed
-                        if (addr == 0x8044)
-                                continue;
-                        retval = i2c_smbus_write_word_data(client, cmd, val);
-                        if (retval) {
-                                goto error_exit;
-                        }
-                        /* A write takes up to 11 ms */
+        return count;
-                        msleep(11);
-                }
-        }
-        /* Invalidate the scratch buffer */
-        for (slice = (off >> SLICE_BITS); slice <= ((off + count - 1) >> SLICE_BITS); slice++)
-                blk->valid &= ~(1 << slice);
-        error_exit:
-        up(&data->update_lock);
-        return sent;
-}
-static ssize_t max6875_user_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_write(kobj, buf, off, count, max6875_eeprom_user);
-}
-static ssize_t max6875_config_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_write(kobj, buf, off, count, max6875_eeprom_config);
-}
-static ssize_t max6875_cfgreg_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
-{
-        return max6875_write(kobj, buf, off, count, max6875_register_config);
 }
 static struct bin_attribute user_eeprom_attr = {
        .attr = {
-                .name = "eeprom_user",
+                .name = "eeprom",
-                .mode = S_IRUGO | S_IWUSR | S_IWGRP,
+                .mode = S_IRUGO,
-                .owner = THIS_MODULE,
-        },
-        .size  = USER_EEPROM_SIZE,
-        .read  = max6875_user_read,
-        .write = max6875_user_write,
-};
-static struct bin_attribute config_eeprom_attr = {
-        .attr = {
-                .name = "eeprom_config",
-                .mode = S_IRUGO | S_IWUSR,
-                .owner = THIS_MODULE,
-        },
-        .size  = CONFIG_EEPROM_SIZE,
-        .read  = max6875_config_read,
-        .write = max6875_config_write,
-};
-static struct bin_attribute config_register_attr = {
-        .attr = {
-                .name = "reg_config",
-                .mode = S_IRUGO | S_IWUSR,
                .owner = THIS_MODULE,
        },
-        .size  = CONFIG_EEPROM_SIZE,
+        .size = USER_EEPROM_SIZE,
-        .read  = max6875_cfgreg_read,
+        .read = max6875_read,
-        .write = max6875_cfgreg_write,
 };
 static int max6875_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, max6875_detect);
+        return i2c_probe(adapter, &addr_data, max6875_detect);
 }
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
 {
-        struct i2c_client *new_client;
+        struct i2c_client *real_client;
+        struct i2c_client *fake_client;
        struct max6875_data *data;
        int err = 0;
-        /* Prevent 24RF08 corruption (in case of user error) */
+        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE_DATA
-        if (kind < 0)
+                                     | I2C_FUNC_SMBUS_READ_BYTE))
-                i2c_smbus_xfer(adapter, address, 0, 0, 0,
+                return 0;
-                               I2C_SMBUS_QUICK, NULL);
+        /* Only check even addresses */
-        /* There are three ways we can read the EEPROM data:
+        if (address & 1)
-           (1) I2C block reads (faster, but unsupported by most adapters)
+                return 0;
-           (2) Consecutive byte reads (100% overhead)
-           (3) Regular byte data reads (200% overhead)
+        if (!(data = kmalloc(sizeof(struct max6875_data), GFP_KERNEL)))
-           The third method is not implemented by this driver because all
+                return -ENOMEM;
-           known adapters support at least the second. */
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_READ_BYTE_DATA |
-                                     I2C_FUNC_SMBUS_BYTE |
-                                     I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
-                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 eeprom_{read,write}_value. */
-        if (!(data = kmalloc(sizeof(struct max6875_data), GFP_KERNEL))) {
-                err = -ENOMEM;
-                goto exit;
-        }
        memset(data, 0, sizeof(struct max6875_data));
-        new_client = &data->client;
+        /* A fake client is created on the odd address */
-        i2c_set_clientdata(new_client, data);
+        if (!(fake_client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
-        new_client->addr = address;
+                err = -ENOMEM;
-        new_client->adapter = adapter;
+                goto exit_kfree1;
-        new_client->driver = &max6875_driver;
+        }
-        new_client->flags = 0;
+        memset(fake_client, 0, sizeof(struct i2c_client));
-        /* Setup the user section */
+        /* Init real i2c_client */
-        data->blocks[max6875_eeprom_user].type    = max6875_eeprom_user;
+        real_client = &data->client;
-        data->blocks[max6875_eeprom_user].slices  = USER_EEPROM_SLICES;
+        i2c_set_clientdata(real_client, data);
-        data->blocks[max6875_eeprom_user].size    = USER_EEPROM_SIZE;
+        real_client->addr = address;
-        data->blocks[max6875_eeprom_user].base    = USER_EEPROM_BASE;
+        real_client->adapter = adapter;
-        data->blocks[max6875_eeprom_user].data    = data->data;
+        real_client->driver = &max6875_driver;
-        data->blocks[max6875_eeprom_user].updated = data->last_updated;
+        real_client->flags = 0;
+        strlcpy(real_client->name, "max6875", I2C_NAME_SIZE);
-        /* Setup the config section */
-        data->blocks[max6875_eeprom_config].type    = max6875_eeprom_config;
-        data->blocks[max6875_eeprom_config].slices  = CONFIG_EEPROM_SLICES;
-        data->blocks[max6875_eeprom_config].size    = CONFIG_EEPROM_SIZE;
-        data->blocks[max6875_eeprom_config].base    = CONFIG_EEPROM_BASE;
-        data->blocks[max6875_eeprom_config].data    = &data->data[USER_EEPROM_SIZE];
-        data->blocks[max6875_eeprom_config].updated = &data->last_updated[USER_EEPROM_SLICES];
-        /* Setup the register section */
-        data->blocks[max6875_register_config].type    = max6875_register_config;
-        data->blocks[max6875_register_config].slices  = CONFIG_EEPROM_SLICES;
-        data->blocks[max6875_register_config].size    = CONFIG_EEPROM_SIZE;
-        data->blocks[max6875_register_config].base    = 0;
-        data->blocks[max6875_register_config].data    = &data->data[USER_EEPROM_SIZE+CONFIG_EEPROM_SIZE];
-        data->blocks[max6875_register_config].updated = &data->last_updated[USER_EEPROM_SLICES+CONFIG_EEPROM_SLICES];
-        /* Init the data */
-        memset(data->data, 0xff, sizeof(data->data));
-        /* Fill in the remaining client fields */
-        strlcpy(new_client->name, "max6875", I2C_NAME_SIZE);
        init_MUTEX(&data->update_lock);
-        /* Verify that the chip is really what we think it is */
+        /* Init fake client data */
-        if ((max6875_update_slice(new_client, &data->blocks[max6875_eeprom_config], 4) < 0) ||
+        /* set the client data to the i2c_client so that it will get freed */
-            (max6875_update_slice(new_client, &data->blocks[max6875_register_config], 4) < 0))
+        i2c_set_clientdata(fake_client, fake_client);
-                goto exit_kfree;
+        fake_client->addr = address | 1;
+        fake_client->adapter = adapter;
-        /* 0x41,0x42 must be zero and 0x40 must match in eeprom and registers */
+        fake_client->driver = &max6875_driver;
-        if ((data->blocks[max6875_eeprom_config].data[0x41] != 0) ||
+        fake_client->flags = 0;
-            (data->blocks[max6875_eeprom_config].data[0x42] != 0) ||
+        strlcpy(fake_client->name, "max6875 subclient", I2C_NAME_SIZE);
-            (data->blocks[max6875_register_config].data[0x41] != 0) ||
-            (data->blocks[max6875_register_config].data[0x42] != 0) ||
+        /* Prevent 24RF08 corruption (in case of user error) */
-            (data->blocks[max6875_eeprom_config].data[0x40] !=
+        i2c_smbus_write_quick(real_client, 0);
-             data->blocks[max6875_register_config].data[0x40]))
-                goto exit_kfree;
+        if ((err = i2c_attach_client(real_client)) != 0)
+                goto exit_kfree2;
-        /* Tell the I2C layer a new client has arrived */
-        if ((err = i2c_attach_client(new_client)))
+        if ((err = i2c_attach_client(fake_client)) != 0)
-                goto exit_kfree;
+                goto exit_detach;
-        /* create the sysfs eeprom files with the correct permissions */
+        sysfs_create_bin_file(&real_client->dev.kobj, &user_eeprom_attr);
-        if (allow_write == 0) {
-                user_eeprom_attr.attr.mode &= ~S_IWUGO;
-                user_eeprom_attr.write = NULL;
-                config_eeprom_attr.attr.mode &= ~S_IWUGO;
-                config_eeprom_attr.write = NULL;
-                config_register_attr.attr.mode &= ~S_IWUGO;
-                config_register_attr.write = NULL;
-        }
-        sysfs_create_bin_file(&new_client->dev.kobj, &user_eeprom_attr);
-        sysfs_create_bin_file(&new_client->dev.kobj, &config_eeprom_attr);
-        sysfs_create_bin_file(&new_client->dev.kobj, &config_register_attr);
        return 0;
-exit_kfree:
+exit_detach:
+        i2c_detach_client(real_client);
+exit_kfree2:
+        kfree(fake_client);
+exit_kfree1:
        kfree(data);
-exit:
        return err;
 }
@@ -450,13 +236,9 @@ static int max6875_detach_client(struct i2c_client *client)
        int err;
        err = i2c_detach_client(client);
-        if (err) {
+        if (err)
-                dev_err(&client->dev, "Client deregistration failed, client not detached.\n");
                return err;
-        }
        kfree(i2c_get_clientdata(client));
        return 0;
 }
diff --git a/drivers/i2c/chips/pca9539.c b/drivers/i2c/chips/pca9539.c
index 9f3ad45daae2..225577fdda4d 100644
--- a/drivers/i2c/chips/pca9539.c
+++ b/drivers/i2c/chips/pca9539.c
@@ -13,14 +13,12 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/hwmon-sysfs.h>
-#include <linux/i2c-sensor.h>
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {0x74, 0x75, 0x76, 0x77, I2C_CLIENT_END};
-static unsigned int normal_isa[] = {I2C_CLIENT_ISA_END};
 /* Insmod parameters */
-SENSORS_INSMOD_1(pca9539);
+I2C_CLIENT_INSMOD_1(pca9539);
 enum pca9539_cmd
 {
@@ -109,10 +107,10 @@ static struct attribute_group pca9539_defattr_group = {
 static int pca9539_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, pca9539_detect);
+        return i2c_probe(adapter, &addr_data, pca9539_detect);
 }
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 static int pca9539_detect(struct i2c_adapter *adapter, int address, int kind)
 {
        struct i2c_client *new_client;
@@ -164,10 +162,8 @@ static int pca9539_detach_client(struct i2c_client *client)
 {
        int err;
-        if ((err = i2c_detach_client(client))) {
+        if ((err = i2c_detach_client(client)))
-                dev_err(&client->dev, "Client deregistration failed.\n");
                return err;
-        }
        kfree(i2c_get_clientdata(client));
        return 0;
diff --git a/drivers/i2c/chips/pcf8574.c b/drivers/i2c/chips/pcf8574.c
index cfcf64654080..6525743ff9fd 100644
--- a/drivers/i2c/chips/pcf8574.c
+++ b/drivers/i2c/chips/pcf8574.c
@@ -39,16 +39,14 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
                                        0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
                                        I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_2(pcf8574, pcf8574a);
+I2C_CLIENT_INSMOD_2(pcf8574, pcf8574a);
 /* Initial values */
 #define PCF8574_INIT 255        /* All outputs on (input mode) */
@@ -113,10 +111,10 @@ static DEVICE_ATTR(write, S_IWUSR | S_IRUGO, show_write, set_write);
 static int pcf8574_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, pcf8574_detect);
+        return i2c_probe(adapter, &addr_data, pcf8574_detect);
 }
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int pcf8574_detect(struct i2c_adapter *adapter, int address, int kind)
 {
        struct i2c_client *new_client;
@@ -186,11 +184,8 @@ static int pcf8574_detach_client(struct i2c_client *client)
 {
        int err;
-        if ((err = i2c_detach_client(client))) {
+        if ((err = i2c_detach_client(client)))
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
                return err;
-        }
        kfree(i2c_get_clientdata(client));
        return 0;
diff --git a/drivers/i2c/chips/pcf8591.c b/drivers/i2c/chips/pcf8591.c
index db812ade8564..80f1df9a4500 100644
--- a/drivers/i2c/chips/pcf8591.c
+++ b/drivers/i2c/chips/pcf8591.c
@@ -24,15 +24,13 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
 /* Addresses to scan */
 static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
                                        0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
-static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 /* Insmod parameters */
-SENSORS_INSMOD_1(pcf8591);
+I2C_CLIENT_INSMOD_1(pcf8591);
 static int input_mode;
 module_param(input_mode, int, 0);
@@ -164,10 +162,10 @@ static DEVICE_ATTR(out0_enable, S_IWUSR | S_IRUGO,
 */
 static int pcf8591_attach_adapter(struct i2c_adapter *adapter)
 {
-        return i2c_detect(adapter, &addr_data, pcf8591_detect);
+        return i2c_probe(adapter, &addr_data, pcf8591_detect);
 }
-/* This function is called by i2c_detect */
+/* This function is called by i2c_probe */
 int pcf8591_detect(struct i2c_adapter *adapter, int address, int kind)
 {
        struct i2c_client *new_client;
@@ -241,11 +239,8 @@ static int pcf8591_detach_client(struct i2c_client *client)
 {
        int err;
-        if ((err = i2c_detach_client(client))) {
+        if ((err = i2c_detach_client(client)))
-                dev_err(&client->dev,
-                        "Client deregistration failed, client not detached.\n");
                return err;
-        }
        kfree(i2c_get_clientdata(client));
        return 0;
diff --git a/drivers/i2c/chips/rtc8564.c b/drivers/i2c/chips/rtc8564.c
index 588fc2261a91..0b5385c892b1 100644
--- a/drivers/i2c/chips/rtc8564.c
+++ b/drivers/i2c/chips/rtc8564.c
@@ -67,7 +67,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_addr,
        .probe                  = ignore,
        .ignore                 = ignore,
-        .force                  = ignore,
 };
 static int rtc8564_read_mem(struct i2c_client *client, struct mem *mem);
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 4a9ead277596..dda472e5e8be 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -61,7 +61,7 @@ static int i2c_bus_resume(struct device * dev)
        return rc;
 }
-static struct bus_type i2c_bus_type = {
+struct bus_type i2c_bus_type = {
        .name =         "i2c",
        .match =        i2c_device_match,
        .suspend =      i2c_bus_suspend,
@@ -78,13 +78,13 @@ static int i2c_device_remove(struct device *dev)
        return 0;
 }
-static void i2c_adapter_dev_release(struct device *dev)
+void i2c_adapter_dev_release(struct device *dev)
 {
        struct i2c_adapter *adap = dev_to_i2c_adapter(dev);
        complete(&adap->dev_released);
 }
-static struct device_driver i2c_adapter_driver = {
+struct device_driver i2c_adapter_driver = {
        .name = "i2c_adapter",
        .bus = &i2c_bus_type,
        .probe = i2c_device_probe,
@@ -97,7 +97,7 @@ static void i2c_adapter_class_dev_release(struct class_device *dev)
        complete(&adap->class_dev_released);
 }
-static struct class i2c_adapter_class = {
+struct class i2c_adapter_class = {
        .name =         "i2c-adapter",
        .release =      &i2c_adapter_class_dev_release,
 };
@@ -188,6 +188,8 @@ int i2c_add_adapter(struct i2c_adapter *adap)
        strlcpy(adap->class_dev.class_id, adap->dev.bus_id, BUS_ID_SIZE);
        class_device_register(&adap->class_dev);
+        dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
        /* inform drivers of new adapters */
        list_for_each(item,&drivers) {
                driver = list_entry(item, struct i2c_driver, list);
@@ -196,8 +198,6 @@ int i2c_add_adapter(struct i2c_adapter *adap)
                        driver->attach_adapter(adap);
        }
-        dev_dbg(&adap->dev, "registered as adapter #%d\n", adap->nr);
 out_unlock:
        up(&core_lists);
        return res;
@@ -220,8 +220,8 @@ int i2c_del_adapter(struct i2c_adapter *adap)
                        break;
        }
        if (adap_from_list != adap) {
-                pr_debug("I2C: Attempting to delete an unregistered "
+                pr_debug("i2c-core: attempting to delete unregistered "
-                         "adapter\n");
+                         "adapter [%s]\n", adap->name);
                res = -EINVAL;
                goto out_unlock;
        }
@@ -230,9 +230,8 @@ int i2c_del_adapter(struct i2c_adapter *adap)
                driver = list_entry(item, struct i2c_driver, list);
                if (driver->detach_adapter)
                        if ((res = driver->detach_adapter(adap))) {
-                                dev_warn(&adap->dev, "can't detach adapter "
+                                dev_err(&adap->dev, "detach_adapter failed "
-                                         "while detaching driver %s: driver "
+                                        "for driver [%s]\n", driver->name);
-                                         "not detached!\n", driver->name);
                                goto out_unlock;
                        }
        }
@@ -247,9 +246,8 @@ int i2c_del_adapter(struct i2c_adapter *adap)
                 * must be deleted, as this would cause invalid states.
                 */
                if ((res=client->driver->detach_client(client))) {
-                        dev_err(&adap->dev, "adapter not "
+                        dev_err(&adap->dev, "detach_client failed for client "
-                                "unregistered, because client at "
+                                "[%s] at address 0x%02x\n", client->name,
-                                "address %02x can't be detached. ",
                                client->addr);
                        goto out_unlock;
                }
@@ -270,7 +268,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
        /* free dynamically allocated bus id */
        idr_remove(&i2c_adapter_idr, adap->nr);
-        dev_dbg(&adap->dev, "adapter unregistered\n");
+        dev_dbg(&adap->dev, "adapter [%s] unregistered\n", adap->name);
 out_unlock:
        up(&core_lists);
@@ -303,7 +301,7 @@ int i2c_add_driver(struct i2c_driver *driver)
                goto out_unlock;
        
        list_add_tail(&driver->list,&drivers);
-        pr_debug("i2c-core: driver %s registered.\n", driver->name);
+        pr_debug("i2c-core: driver [%s] registered\n", driver->name);
        /* now look for instances of driver on our adapters */
        if (driver->flags & I2C_DF_NOTIFY) {
@@ -331,21 +329,17 @@ int i2c_del_driver(struct i2c_driver *driver)
        /* Have a look at each adapter, if clients of this driver are still
         * attached. If so, detach them to be able to kill the driver 
         * afterwards.
-         */
+         *
-        pr_debug("i2c-core: unregister_driver - looking for clients.\n");
+         * Removing clients does not depend on the notify flag, else
-        /* removing clients does not depend on the notify flag, else 
         * invalid operation might (will!) result, when using stale client
         * pointers.
         */
        list_for_each(item1,&adapters) {
                adap = list_entry(item1, struct i2c_adapter, list);
-                dev_dbg(&adap->dev, "examining adapter\n");
                if (driver->detach_adapter) {
                        if ((res = driver->detach_adapter(adap))) {
-                                dev_warn(&adap->dev, "while unregistering "
+                                dev_err(&adap->dev, "detach_adapter failed "
-                                       "dummy driver %s, adapter could "
+                                        "for driver [%s]\n", driver->name);
-                                       "not be detached properly; driver "
-                                       "not unloaded!",driver->name);
                                goto out_unlock;
                        }
                } else {
@@ -353,16 +347,13 @@ int i2c_del_driver(struct i2c_driver *driver)
                                client = list_entry(item2, struct i2c_client, list);
                                if (client->driver != driver)
                                        continue;
-                                pr_debug("i2c-core.o: detaching client %s:\n", client->name);
+                                dev_dbg(&adap->dev, "detaching client [%s] "
+                                        "at 0x%02x\n", client->name,
+                                        client->addr);
                                if ((res = driver->detach_client(client))) {
-                                        dev_err(&adap->dev, "while "
+                                        dev_err(&adap->dev, "detach_client "
-                                                "unregistering driver "
+                                                "failed for client [%s] at "
-                                                "`%s', the client at "
+                                                "0x%02x\n", client->name,
-                                                "address %02x of "
-                                                "adapter could not "
-                                                "be detached; driver "
-                                                "not unloaded!",
-                                                driver->name,
                                                client->addr);
                                        goto out_unlock;
                                }
@@ -372,7 +363,7 @@ int i2c_del_driver(struct i2c_driver *driver)
        driver_unregister(&driver->driver);
        list_del(&driver->list);
-        pr_debug("i2c-core: driver unregistered: %s\n", driver->name);
+        pr_debug("i2c-core: driver [%s] unregistered\n", driver->name);
 out_unlock:
        up(&core_lists);
@@ -417,15 +408,12 @@ int i2c_attach_client(struct i2c_client *client)
        
        if (adapter->client_register)  {
                if (adapter->client_register(client))  {
-                        dev_warn(&adapter->dev, "warning: client_register "
+                        dev_dbg(&adapter->dev, "client_register "
-                                "seems to have failed for client %02x\n",
+                                "failed for client [%s] at 0x%02x\n",
-                                client->addr);
+                                client->name, client->addr);
                }
        }
-        dev_dbg(&adapter->dev, "client [%s] registered to adapter\n",
-                client->name);
        if (client->flags & I2C_CLIENT_ALLOW_USE)
                client->usage_count = 0;
@@ -436,7 +424,8 @@ int i2c_attach_client(struct i2c_client *client)
        
        snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
                "%d-%04x", i2c_adapter_id(adapter), client->addr);
-        pr_debug("registering %s\n", client->dev.bus_id);
+        dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
+                client->name, client->dev.bus_id);
        device_register(&client->dev);
        device_create_file(&client->dev, &dev_attr_client_name);
        
@@ -449,8 +438,12 @@ int i2c_detach_client(struct i2c_client *client)
        struct i2c_adapter *adapter = client->adapter;
        int res = 0;
        
-        if ((client->flags & I2C_CLIENT_ALLOW_USE) && (client->usage_count > 0))
+        if ((client->flags & I2C_CLIENT_ALLOW_USE)
+         && (client->usage_count > 0)) {
+                dev_warn(&client->dev, "Client [%s] still busy, "
+                         "can't detach\n", client->name);
                return -EBUSY;
+        }
        if (adapter->client_unregister)  {
                res = adapter->client_unregister(client);
@@ -669,98 +662,128 @@ int i2c_control(struct i2c_client *client,
 * Will not work for 10-bit addresses!
 * ----------------------------------------------------
 */
+static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,
+                             int (*found_proc) (struct i2c_adapter *, int, int))
+{
+        int err;
+        /* Make sure the address is valid */
+        if (addr < 0x03 || addr > 0x77) {
+                dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
+                         addr);
+                return -EINVAL;
+        }
+        /* Skip if already in use */
+        if (i2c_check_addr(adapter, addr))
+                return 0;
+        /* Make sure there is something at this address, unless forced */
+        if (kind < 0) {
+                if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
+                                   I2C_SMBUS_QUICK, NULL) < 0)
+                        return 0;
+                /* prevent 24RF08 corruption */
+                if ((addr & ~0x0f) == 0x50)
+                        i2c_smbus_xfer(adapter, addr, 0, 0, 0,
+                                       I2C_SMBUS_QUICK, NULL);
+        }
+        /* Finally call the custom detection function */
+        err = found_proc(adapter, addr, kind);
+        /* -ENODEV can be returned if there is a chip at the given address
+           but it isn't supported by this chip driver. We catch it here as
+           this isn't an error. */
+        return (err == -ENODEV) ? 0 : err;
+}
 int i2c_probe(struct i2c_adapter *adapter,
              struct i2c_client_address_data *address_data,
              int (*found_proc) (struct i2c_adapter *, int, int))
 {
-        int addr,i,found,err;
+        int i, err;
        int adap_id = i2c_adapter_id(adapter);
        /* Forget it if we can't probe using SMBUS_QUICK */
        if (! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_QUICK))
                return -1;
-        for (addr = 0x00; addr <= 0x7f; addr++) {
+        /* Force entries are done first, and are not affected by ignore
+           entries */
-                /* Skip if already in use */
+        if (address_data->forces) {
-                if (i2c_check_addr(adapter,addr))
+                unsigned short **forces = address_data->forces;
-                        continue;
+                int kind;
-                /* If it is in one of the force entries, we don't do any detection
+                for (kind = 0; forces[kind]; kind++) {
-                   at all */
+                        for (i = 0; forces[kind][i] != I2C_CLIENT_END;
-                found = 0;
+                             i += 2) {
+                                if (forces[kind][i] == adap_id
-                for (i = 0; !found && (address_data->force[i] != I2C_CLIENT_END); i += 2) {
+                                 || forces[kind][i] == ANY_I2C_BUS) {
-                        if (((adap_id == address_data->force[i]) || 
+                                        dev_dbg(&adapter->dev, "found force "
-                             (address_data->force[i] == ANY_I2C_BUS)) &&
+                                                "parameter for adapter %d, "
-                             (addr == address_data->force[i+1])) {
+                                                "addr 0x%02x, kind %d\n",
-                                dev_dbg(&adapter->dev, "found force parameter for adapter %d, addr %04x\n",
+                                                adap_id, forces[kind][i + 1],
-                                        adap_id, addr);
+                                                kind);
-                                if ((err = found_proc(adapter,addr,0)))
+                                        err = i2c_probe_address(adapter,
-                                        return err;
+                                                forces[kind][i + 1],
-                                found = 1;
+                                                kind, found_proc);
-                        }
+                                        if (err)
-                }
+                                                return err;
-                if (found) 
+                                }
-                        continue;
-                /* If this address is in one of the ignores, we can forget about
-                   it right now */
-                for (i = 0;
-                     !found && (address_data->ignore[i] != I2C_CLIENT_END);
-                     i += 2) {
-                        if (((adap_id == address_data->ignore[i]) || 
-                            ((address_data->ignore[i] == ANY_I2C_BUS))) &&
-                            (addr == address_data->ignore[i+1])) {
-                                dev_dbg(&adapter->dev, "found ignore parameter for adapter %d, "
-                                        "addr %04x\n", adap_id ,addr);
-                                found = 1;
                        }
                }
-                if (found) 
+        }
-                        continue;
-                /* Now, we will do a detection, but only if it is in the normal or 
+        /* Probe entries are done second, and are not affected by ignore
-                   probe entries */  
+           entries either */
-                for (i = 0;
+        for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {
-                     !found && (address_data->normal_i2c[i] != I2C_CLIENT_END);
+                if (address_data->probe[i] == adap_id
-                     i += 1) {
+                 || address_data->probe[i] == ANY_I2C_BUS) {
-                        if (addr == address_data->normal_i2c[i]) {
+                        dev_dbg(&adapter->dev, "found probe parameter for "
-                                found = 1;
+                                "adapter %d, addr 0x%02x\n", adap_id,
-                                dev_dbg(&adapter->dev, "found normal i2c entry for adapter %d, "
+                                address_data->probe[i + 1]);
-                                        "addr %02x\n", adap_id, addr);
+                        err = i2c_probe_address(adapter,
-                        }
+                                                address_data->probe[i + 1],
+                                                -1, found_proc);
+                        if (err)
+                                return err;
                }
+        }
-                for (i = 0;
+        /* Normal entries are done last, unless shadowed by an ignore entry */
-                     !found && (address_data->probe[i] != I2C_CLIENT_END);
+        for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1) {
-                     i += 2) {
+                int j, ignore;
-                        if (((adap_id == address_data->probe[i]) ||
-                            ((address_data->probe[i] == ANY_I2C_BUS))) &&
+                ignore = 0;
-                            (addr == address_data->probe[i+1])) {
+                for (j = 0; address_data->ignore[j] != I2C_CLIENT_END;
-                                found = 1;
+                     j += 2) {
-                                dev_dbg(&adapter->dev, "found probe parameter for adapter %d, "
+                        if ((address_data->ignore[j] == adap_id ||
-                                        "addr %04x\n", adap_id,addr);
+                             address_data->ignore[j] == ANY_I2C_BUS)
+                         && address_data->ignore[j + 1]
+                            == address_data->normal_i2c[i]) {
+                                dev_dbg(&adapter->dev, "found ignore "
+                                        "parameter for adapter %d, "
+                                        "addr 0x%02x\n", adap_id,
+                                        address_data->ignore[j + 1]);
                        }
+                        ignore = 1;
+                        break;
                }
-                if (!found) 
+                if (ignore)
                        continue;
-                /* OK, so we really should examine this address. First check
+                dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
-                   whether there is some client here at all! */
+                        "addr 0x%02x\n", adap_id,
-                if (i2c_smbus_xfer(adapter,addr,0,0,0,I2C_SMBUS_QUICK,NULL) >= 0)
+                        address_data->normal_i2c[i]);
-                        if ((err = found_proc(adapter,addr,-1)))
+                err = i2c_probe_address(adapter, address_data->normal_i2c[i],
-                                return err;
+                                        -1, found_proc);
+                if (err)
+                        return err;
        }
-        return 0;
-}
-/*
+        return 0;
- * return id number for a specific adapter
- */
-int i2c_adapter_id(struct i2c_adapter *adap)
-{
-        return adap->nr;
 }
 struct i2c_adapter* i2c_get_adapter(int id)
@@ -1171,6 +1194,12 @@ s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags,
 }
+/* Next four are needed by i2c-isa */
+EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);
+EXPORT_SYMBOL_GPL(i2c_adapter_driver);
+EXPORT_SYMBOL_GPL(i2c_adapter_class);
+EXPORT_SYMBOL_GPL(i2c_bus_type);
 EXPORT_SYMBOL(i2c_add_adapter);
 EXPORT_SYMBOL(i2c_del_adapter);
 EXPORT_SYMBOL(i2c_add_driver);
@@ -1186,7 +1215,6 @@ EXPORT_SYMBOL(i2c_master_send);
 EXPORT_SYMBOL(i2c_master_recv);
 EXPORT_SYMBOL(i2c_control);
 EXPORT_SYMBOL(i2c_transfer);
-EXPORT_SYMBOL(i2c_adapter_id);
 EXPORT_SYMBOL(i2c_get_adapter);
 EXPORT_SYMBOL(i2c_put_adapter);
 EXPORT_SYMBOL(i2c_probe);
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index bc5d557e5dd9..aa7a4fadef64 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -434,7 +434,8 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)
        devfs_mk_cdev(MKDEV(I2C_MAJOR, i2c_dev->minor),
                        S_IFCHR|S_IRUSR|S_IWUSR, "i2c/%d", i2c_dev->minor);
-        dev_dbg(&adap->dev, "Registered as minor %d\n", i2c_dev->minor);
+        pr_debug("i2c-dev: adapter [%s] registered as minor %d\n",
+                 adap->name, i2c_dev->minor);
        /* register this i2c device with the driver core */
        i2c_dev->adap = adap;
@@ -471,7 +472,7 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap)
        wait_for_completion(&i2c_dev->released);
        kfree(i2c_dev);
-        dev_dbg(&adap->dev, "Adapter unregistered\n");
+        pr_debug("i2c-dev: adapter [%s] unregistered\n", adap->name);
        return 0;
 }
diff --git a/drivers/i2c/i2c-sensor-detect.c b/drivers/i2c/i2c-sensor-detect.c
deleted file mode 100644
index f99a8161a9f1..000000000000
--- a/drivers/i2c/i2c-sensor-detect.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-    i2c-sensor-detect.c - Part of lm_sensors, Linux kernel modules for hardware
-                          monitoring
-    Copyright (c) 1998 - 2001 Frodo Looijaard <frodol@dds.nl> and
-    Mark D. Studebaker <mdsxyz123@yahoo.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/kernel.h>
-#include <linux/i2c.h>
-#include <linux/i2c-sensor.h>
-static unsigned short empty[] = {I2C_CLIENT_END};
-static unsigned int empty_isa[] = {I2C_CLIENT_ISA_END};
-/* Very inefficient for ISA detects, and won't work for 10-bit addresses! */
-int i2c_detect(struct i2c_adapter *adapter,
-               struct i2c_address_data *address_data,
-               int (*found_proc) (struct i2c_adapter *, int, int))
-{
-        int addr, i, found, j, err;
-        struct i2c_force_data *this_force;
-        int is_isa = i2c_is_isa_adapter(adapter);
-        int adapter_id =
-            is_isa ? ANY_I2C_ISA_BUS : i2c_adapter_id(adapter);
-        unsigned short *normal_i2c;
-        unsigned int *normal_isa;
-        unsigned short *probe;
-        unsigned short *ignore;
-        /* Forget it if we can't probe using SMBUS_QUICK */
-        if ((!is_isa) &&
-            !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK))
-                return -1;
-        
-        /* Use default "empty" list if the adapter doesn't specify any */
-        normal_i2c = probe = ignore = empty;
-        normal_isa = empty_isa;
-        if (address_data->normal_i2c)
-                normal_i2c = address_data->normal_i2c;
-        if (address_data->normal_isa)
-                normal_isa = address_data->normal_isa;
-        if (address_data->probe)
-                probe = address_data->probe;
-        if (address_data->ignore)
-                ignore = address_data->ignore;
-        for (addr = 0x00; addr <= (is_isa ? 0xffff : 0x7f); addr++) {
-                if (!is_isa && i2c_check_addr(adapter, addr))
-                        continue;
-                /* If it is in one of the force entries, we don't do any
-                   detection at all */
-                found = 0;
-                for (i = 0; !found && (this_force = address_data->forces + i, this_force->force); i++) {
-                        for (j = 0; !found && (this_force->force[j] != I2C_CLIENT_END); j += 2) {
-                                if ( ((adapter_id == this_force->force[j]) ||
-                                      ((this_force->force[j] == ANY_I2C_BUS) && !is_isa)) &&
-                                      (addr == this_force->force[j + 1]) ) {
-                                        dev_dbg(&adapter->dev, "found force parameter for adapter %d, addr %04x\n", adapter_id, addr);
-                                        if ((err = found_proc(adapter, addr, this_force->kind)))
-                                                return err;
-                                        found = 1;
-                                }
-                        }
-                }
-                if (found)
-                        continue;
-                /* If this address is in one of the ignores, we can forget about it
-                   right now */
-                for (i = 0; !found && (ignore[i] != I2C_CLIENT_END); i += 2) {
-                        if ( ((adapter_id == ignore[i]) ||
-                              ((ignore[i] == ANY_I2C_BUS) &&
-                               !is_isa)) &&
-                              (addr == ignore[i + 1])) {
-                                dev_dbg(&adapter->dev, "found ignore parameter for adapter %d, addr %04x\n", adapter_id, addr);
-                                found = 1;
-                        }
-                }
-                if (found)
-                        continue;
-                /* Now, we will do a detection, but only if it is in the normal or 
-                   probe entries */
-                if (is_isa) {
-                        for (i = 0; !found && (normal_isa[i] != I2C_CLIENT_ISA_END); i += 1) {
-                                if (addr == normal_isa[i]) {
-                                        dev_dbg(&adapter->dev, "found normal isa entry for adapter %d, addr %04x\n", adapter_id, addr);
-                                        found = 1;
-                                }
-                        }
-                } else {
-                        for (i = 0; !found && (normal_i2c[i] != I2C_CLIENT_END); i += 1) {
-                                if (addr == normal_i2c[i]) {
-                                        found = 1;
-                                        dev_dbg(&adapter->dev, "found normal i2c entry for adapter %d, addr %02x\n", adapter_id, addr);
-                                }
-                        }
-                }
-                for (i = 0;
-                     !found && (probe[i] != I2C_CLIENT_END);
-                     i += 2) {
-                        if (((adapter_id == probe[i]) ||
-                             ((probe[i] == ANY_I2C_BUS) && !is_isa))
-                            && (addr == probe[i + 1])) {
-                                dev_dbg(&adapter->dev, "found probe parameter for adapter %d, addr %04x\n", adapter_id, addr);
-                                found = 1;
-                        }
-                }
-                if (!found)
-                        continue;
-                /* OK, so we really should examine this address. First check
-                   whether there is some client here at all! */
-                if (is_isa ||
-                    (i2c_smbus_xfer (adapter, addr, 0, 0, 0, I2C_SMBUS_QUICK, NULL) >= 0))
-                        if ((err = found_proc(adapter, addr, -1)))
-                                return err;
-        }
-        return 0;
-}
-EXPORT_SYMBOL(i2c_detect);
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, "
-              "Rudolf Marek <r.marek@sh.cvut.cz>");
-MODULE_DESCRIPTION("i2c-sensor driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/i2c-sensor-vid.c b/drivers/i2c/i2c-sensor-vid.c
deleted file mode 100644
index 922e22f054bb..000000000000
--- a/drivers/i2c/i2c-sensor-vid.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    i2c-sensor-vid.c -  Part of lm_sensors, Linux kernel modules for hardware
-                        monitoring
-    Copyright (c) 2004 Rudolf Marek <r.marek@sh.cvut.cz>
-    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/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-struct vrm_model {
-        u8 vendor;
-        u8 eff_family;
-        u8 eff_model;
-        int vrm_type;
-};
-#define ANY 0xFF
-#ifdef CONFIG_X86
-static struct vrm_model vrm_models[] = {
-        {X86_VENDOR_AMD, 0x6, ANY, 90},         /* Athlon Duron etc */
-        {X86_VENDOR_AMD, 0xF, ANY, 24},         /* Athlon 64, Opteron */
-        {X86_VENDOR_INTEL, 0x6, 0x9, 85},       /* 0.13um too */
-        {X86_VENDOR_INTEL, 0x6, 0xB, 85},       /* 0xB Tualatin */
-        {X86_VENDOR_INTEL, 0x6, ANY, 82},       /* any P6 */
-        {X86_VENDOR_INTEL, 0x7, ANY, 0},        /* Itanium */
-        {X86_VENDOR_INTEL, 0xF, 0x3, 100},      /* P4 Prescott */
-        {X86_VENDOR_INTEL, 0xF, ANY, 90},       /* P4 before Prescott */
-        {X86_VENDOR_INTEL, 0x10,ANY, 0},        /* Itanium 2 */
-        {X86_VENDOR_UNKNOWN, ANY, ANY, 0}       /* stop here */
-        };
-static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor)
-{
-        int i = 0;
-        while (vrm_models[i].vendor!=X86_VENDOR_UNKNOWN) {
-                if (vrm_models[i].vendor==vendor)
-                        if ((vrm_models[i].eff_family==eff_family)&& \
-                        ((vrm_models[i].eff_model==eff_model)|| \
-                        (vrm_models[i].eff_model==ANY)))
-                                return vrm_models[i].vrm_type;
-                i++;
-        }
-        return 0;
-}
-int i2c_which_vrm(void)
-{
-        struct cpuinfo_x86 *c = cpu_data;
-        u32 eax;
-        u8 eff_family, eff_model;
-        int vrm_ret;
-        if (c->x86 < 6) return 0;       /* any CPU with familly lower than 6
-                                        dont have VID and/or CPUID */
-        eax = cpuid_eax(1);
-        eff_family = ((eax & 0x00000F00)>>8);
-        eff_model  = ((eax & 0x000000F0)>>4);
-        if (eff_family == 0xF) {        /* use extended model & family */
-                eff_family += ((eax & 0x00F00000)>>20);
-                eff_model += ((eax & 0x000F0000)>>16)<<4;
-        }
-        vrm_ret = find_vrm(eff_family,eff_model,c->x86_vendor);
-        if (vrm_ret == 0)
-                printk(KERN_INFO "i2c-sensor.o: Unknown VRM version of your"
-                " x86 CPU\n");
-        return vrm_ret;
-}
-/* and now for something completely different for Non-x86 world*/
-#else
-int i2c_which_vrm(void)
-{
-        printk(KERN_INFO "i2c-sensor.o: Unknown VRM version of your CPU\n");
-        return 0;
-}
-#endif
-EXPORT_SYMBOL(i2c_which_vrm);
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index 36074e6eeebb..6b1ab875333b 100644
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -1464,26 +1464,6 @@ static int __devinit add_card(struct pci_dev *dev,
                                                  { 0x50, I2C_M_RD, 20, (unsigned char*) lynx->bus_info_block }
                                                };
-#ifdef CONFIG_IEEE1394_VERBOSEDEBUG
-                        union i2c_smbus_data data;
-                        if (i2c_smbus_xfer(i2c_ad, 80, 0, I2C_SMBUS_WRITE, 0, I2C_SMBUS_BYTE,NULL))
-                                PRINT(KERN_ERR, lynx->id,"eeprom read start has failed");
-                        else
-                        {
-                                u16 addr;
-                                for (addr=0x00; addr < 0x100; addr++) {
-                                        if (i2c_smbus_xfer(i2c_ad, 80, 0, I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE,& data)) {
-                                                PRINT(KERN_ERR, lynx->id, "unable to read i2c %x", addr);
-                                                break;
-                                        }
-                                        else
-                                                PRINT(KERN_DEBUG, lynx->id,"got serial eeprom data at %x: %x",addr, data.byte);
-                                }
-                        }
-#endif
                        /* we use i2c_transfer, because i2c_smbus_read_block_data does not work properly and we
                           do it more efficiently in one transaction rather then using several reads */
                        if (i2c_transfer(i2c_ad, msg, 2) < 0) {
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index 781f23f0cbcc..6284894505c6 100644
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -387,8 +387,6 @@ static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, in
 /* exported algorithm data */
 static struct i2c_algorithm saa7146_algo = {
-        .name           = "saa7146 i2c algorithm",
-        .id             = I2C_ALGO_SAA7146,
        .master_xfer    = saa7146_i2c_xfer,
        .functionality  = saa7146_i2c_func,
 };
@@ -412,7 +410,7 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c
 #endif
                i2c_adapter->algo          = &saa7146_algo;
                i2c_adapter->algo_data     = NULL;
-                i2c_adapter->id            = I2C_ALGO_SAA7146;
+                i2c_adapter->id            = I2C_HW_SAA7146;
                i2c_adapter->timeout = SAA7146_I2C_TIMEOUT;
                i2c_adapter->retries = SAA7146_I2C_RETRIES;
        }
diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c
index be4266d4ae91..56495cb6cd02 100644
--- a/drivers/media/dvb/b2c2/flexcop-i2c.c
+++ b/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -172,8 +172,6 @@ static u32 flexcop_i2c_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm flexcop_algo = {
-        .name                   = "FlexCop I2C algorithm",
-        .id                             = I2C_ALGO_BIT,
        .master_xfer    = flexcop_master_xfer,
        .functionality  = flexcop_i2c_func,
 };
@@ -192,7 +190,6 @@ int flexcop_i2c_init(struct flexcop_device *fc)
        fc->i2c_adap.class          = I2C_CLASS_TV_DIGITAL;
        fc->i2c_adap.algo       = &flexcop_algo;
        fc->i2c_adap.algo_data  = NULL;
-        fc->i2c_adap.id         = I2C_ALGO_BIT;
        if ((ret = i2c_add_adapter(&fc->i2c_adap)) < 0)
                return ret;
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index c3e1b661aae6..9e96a188f1e9 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -141,8 +141,6 @@ static u32 cxusb_i2c_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm cxusb_i2c_algo = {
-        .name          = "Conexant USB I2C algorithm",
-        .id            = I2C_ALGO_BIT,
        .master_xfer   = cxusb_i2c_xfer,
        .functionality = cxusb_i2c_func,
 };
diff --git a/drivers/media/dvb/dvb-usb/dibusb-common.c b/drivers/media/dvb/dvb-usb/dibusb-common.c
index 9b9d6f8ee74e..00b946419b40 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-common.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-common.c
@@ -156,8 +156,6 @@ static u32 dibusb_i2c_func(struct i2c_adapter *adapter)
 }
 struct i2c_algorithm dibusb_i2c_algo = {
-        .name          = "DiBcom USB I2C algorithm",
-        .id            = I2C_ALGO_BIT,
        .master_xfer   = dibusb_i2c_xfer,
        .functionality = dibusb_i2c_func,
 };
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index 9a676afc1d6e..f70e0be0920a 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -77,8 +77,6 @@ static u32 digitv_i2c_func(struct i2c_adapter *adapter)
 }
 static struct i2c_algorithm digitv_i2c_algo = {
-        .name          = "Nebula DigiTV USB I2C algorithm",
-        .id            = I2C_ALGO_BIT,
        .master_xfer   = digitv_i2c_xfer,
        .functionality = digitv_i2c_func,
 };
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 9f0a8d90d146..da970947dfc7 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -27,7 +27,6 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
 #endif
        d->i2c_adap.algo      = d->props.i2c_algo;
        d->i2c_adap.algo_data = NULL;
-        d->i2c_adap.id        = I2C_ALGO_BIT;
        i2c_set_adapdata(&d->i2c_adap, d);
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index 706e0bcb5ede..85b437bbddcd 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -633,7 +633,6 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
        i2c_set_adapdata(&pluto->i2c_adap, pluto);
        strcpy(pluto->i2c_adap.name, DRIVER_NAME);
        pluto->i2c_adap.owner = THIS_MODULE;
-        pluto->i2c_adap.id = I2C_ALGO_BIT;
        pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
        pluto->i2c_adap.dev.parent = &pdev->dev;
        pluto->i2c_adap.algo_data = &pluto->i2c_bit;
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index aa43b5fcb8e7..7daf7b1598a0 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1472,8 +1472,6 @@ static void frontend_init(struct ttusb* ttusb)
 static struct i2c_algorithm ttusb_dec_algo = {
-        .name           = "ttusb dec i2c algorithm",
-        .id             = I2C_ALGO_BIT,
        .master_xfer    = master_xfer,
        .functionality  = functionality,
 };
@@ -1525,7 +1523,6 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 #endif
        ttusb->i2c_adap.algo              = &ttusb_dec_algo;
        ttusb->i2c_adap.algo_data         = NULL;
-        ttusb->i2c_adap.id                = I2C_ALGO_BIT;
        result = i2c_add_adapter(&ttusb->i2c_adap);
        if (result) {
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 48989eda2400..52e32f05d625 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -391,7 +391,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_adv7170;
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index f898b6586374..b5ed9544bdea 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -441,7 +441,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_adv7175;
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 8733588f6db3..c6cfa7c48b04 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -507,7 +507,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_bt819;
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index a070417e65e6..76c1b63ebdf2 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -188,7 +188,7 @@ static int bt832_probe(struct i2c_adapter *adap)
        if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, bt832_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                return i2c_probe(adap, &addr_data, bt832_attach);
 #endif
        return 0;
@@ -241,7 +241,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("bt832"),
+        .name       = "bt832",
        .flags      = I2C_CLIENT_ALLOW_USE,
        .driver     = &driver,
 };
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index a5d529ccf3ad..c13d28658868 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -295,7 +295,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_bt856;
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index 234a85563769..706dc48df962 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -109,7 +109,7 @@ static struct i2c_adapter bttv_i2c_adap_sw_template = {
 #ifdef I2C_CLASS_TV_ANALOG
        .class             = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("bt848"),
+        .name              = "bt848",
        .id                = I2C_HW_B_BT848,
        .client_register   = attach_inform,
 };
@@ -270,8 +270,6 @@ static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int
 }
 static struct i2c_algorithm bttv_algo = {
-        .name          = "bt878",
-        .id            = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,
        .master_xfer   = bttv_i2c_xfer,
        .algo_control  = algo_control,
        .functionality = functionality,
@@ -282,8 +280,8 @@ static struct i2c_adapter bttv_i2c_adap_hw_template = {
 #ifdef I2C_CLASS_TV_ANALOG
        .class         = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("bt878"),
+        .name          = "bt878",
-        .id            = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,
+        .id            = I2C_HW_B_BT848 /* FIXME */,
        .algo          = &bttv_algo,
        .client_register = attach_inform,
 };
@@ -298,7 +296,7 @@ static int attach_inform(struct i2c_client *client)
        if (bttv_debug)
                printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
                        btv->c.nr,client->driver->name,client->addr,
-                        i2c_clientname(client));
+                        client->name);
        if (!client->driver->command)
                return 0;
@@ -326,7 +324,7 @@ void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg)
 }
 static struct i2c_client bttv_i2c_client_template = {
-        I2C_DEVNAME("bttv internal"),
+        .name   = "bttv internal",
 };
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index a628a55299c6..7f598039e025 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -95,7 +95,7 @@ static int attach_inform(struct i2c_client *client)
        struct cx88_core *core = i2c_get_adapdata(client->adapter);
        dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name,client->addr,i2c_clientname(client));
+                client->driver->name, client->addr, client->name);
        if (!client->driver->command)
                return 0;
@@ -128,7 +128,7 @@ static int detach_inform(struct i2c_client *client)
 {
        struct cx88_core *core = i2c_get_adapdata(client->adapter);
-        dprintk(1, "i2c detach [client=%s]\n", i2c_clientname(client));
+        dprintk(1, "i2c detach [client=%s]\n", client->name);
        return 0;
 }
@@ -152,7 +152,7 @@ static struct i2c_algo_bit_data cx8800_i2c_algo_template = {
 /* ----------------------------------------------------------------------- */
 static struct i2c_adapter cx8800_i2c_adap_template = {
-        I2C_DEVNAME("cx2388x"),
+        .name              = "cx2388x",
        .owner             = THIS_MODULE,
        .id                = I2C_HW_B_CX2388x,
        .client_register   = attach_inform,
@@ -160,7 +160,7 @@ static struct i2c_adapter cx8800_i2c_adap_template = {
 };
 static struct i2c_client cx8800_i2c_client_template = {
-        I2C_DEVNAME("cx88xx internal"),
+        .name   = "cx88xx internal",
 };
 static char *i2c_devs[128] = {
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 9fc5055e001c..1e273ff3f956 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -308,7 +308,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("unset"),
+        .name = "unset",
        .driver = &driver
 };
@@ -429,10 +429,10 @@ static int ir_probe(struct i2c_adapter *adap)
        struct i2c_client c; char buf; int i,rc;
        switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
+        case I2C_HW_B_BT848:
                probe = probe_bttv;
                break;
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_SAA7134:
                probe = probe_saa7134;
                break;
        }
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index e956234abf24..ca02f6f14b00 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1437,7 +1437,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("(unset)"),
+        .name      = "(unset)",
        .flags     = I2C_CLIENT_ALLOW_USE,
        .driver    = &driver,
 };
@@ -1509,7 +1509,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
        }
        /* hello world :-) */
-        printk(KERN_INFO "msp34xx: init: chip=%s",i2c_clientname(c));
+        printk(KERN_INFO "msp34xx: init: chip=%s", c->name);
        if (HAVE_NICAM(msp))
                printk(" +nicam");
        if (HAVE_SIMPLE(msp))
diff --git a/drivers/media/video/ovcamchip/ov6x20.c b/drivers/media/video/ovcamchip/ov6x20.c
index 3433619ad93f..b3f4d266cede 100644
--- a/drivers/media/video/ovcamchip/ov6x20.c
+++ b/drivers/media/video/ovcamchip/ov6x20.c
@@ -164,10 +164,10 @@ static int ov6x20_init(struct i2c_client *c)
        DDEBUG(4, &c->dev, "entered");
        switch (c->adapter->id) {
-        case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511:
+        case I2C_HW_SMBUS_OV511:
                rc = ov_write_regvals(c, regvals_init_6x20_511);
                break;
-        case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518:
+        case I2C_HW_SMBUS_OV518:
                rc = ov_write_regvals(c, regvals_init_6x20_518);
                break;
        default:
@@ -338,7 +338,7 @@ static int ov6x20_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
        /******** Palette-specific regs ********/
        /* OV518 needs 8 bit multiplexed in color mode, and 16 bit in B&W */
-        if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+        if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                if (win->format == VIDEO_PALETTE_GREY)
                        ov_write_mask(c, 0x13, 0x00, 0x20);
                else
diff --git a/drivers/media/video/ovcamchip/ov6x30.c b/drivers/media/video/ovcamchip/ov6x30.c
index 44a842379b45..6eab458ab792 100644
--- a/drivers/media/video/ovcamchip/ov6x30.c
+++ b/drivers/media/video/ovcamchip/ov6x30.c
@@ -301,7 +301,7 @@ static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
        /******** Palette-specific regs ********/
        if (win->format == VIDEO_PALETTE_GREY) {
-                if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+                if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                        /* Do nothing - we're already in 8-bit mode */
                } else {
                        ov_write_mask(c, 0x13, 0x20, 0x20);
@@ -313,7 +313,7 @@ static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
                 * Therefore, the OV6630 needs to be in 8-bit multiplexed
                 * output mode */
-                if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+                if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                        /* Do nothing - we want to stay in 8-bit mode */
                        /* Warning: Messing with reg 0x13 breaks OV518 color */
                } else {
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 54dd5612d3b8..2de34ebf0673 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -296,10 +296,10 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
         * attach to adapters that are known to contain OV camera chips. */
        switch (adap->id) {
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511):
+        case I2C_HW_SMBUS_OV511:
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518):
+        case I2C_HW_SMBUS_OV518:
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OVFX2):
+        case I2C_HW_SMBUS_OVFX2:
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_W9968CF):
+        case I2C_HW_SMBUS_W9968CF:
                PDEBUG(1, "Adapter ID 0x%06x accepted", adap->id);
                break;
        default:
@@ -314,7 +314,7 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
        }
        memcpy(c, &client_template, sizeof *c);
        c->adapter = adap;
-        strcpy(i2c_clientname(c), "OV????");
+        strcpy(c->name, "OV????");
        ov = kmalloc(sizeof *ov, GFP_KERNEL);
        if (!ov) {
@@ -328,7 +328,7 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
        if (rc < 0)
                goto error;
-        strcpy(i2c_clientname(c), chip_names[ov->subtype]);
+        strcpy(c->name, chip_names[ov->subtype]);
        PDEBUG(1, "Camera chip detection complete");
@@ -421,7 +421,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template = {
-        I2C_DEVNAME("(unset)"),
+        .name =         "(unset)",
        .driver =       &driver,
 };
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 22d055d8a695..e116bdbed310 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -470,7 +470,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_saa7110;
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index fcd897382fcf..f18df53d98ff 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -489,7 +489,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_saa7111;
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 2ba997f5ef1d..e0c70f54f073 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -827,7 +827,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_saa7114;
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 79d05ea1b69b..382911c6ef22 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -598,7 +598,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("saa6752hs"),
+        .name       = "saa6752hs",
        .flags      = I2C_CLIENT_ALLOW_USE,
        .driver     = &driver,
 };
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 1203b93a572c..eae6b529713f 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -334,7 +334,7 @@ static int attach_inform(struct i2c_client *client)
        struct tuner_setup tun_setup;
        d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name,client->addr,i2c_clientname(client));
+                 client->driver->name, client->addr, client->name);
        if (!client->driver->command)
                return 0;
@@ -370,8 +370,6 @@ static int attach_inform(struct i2c_client *client)
 }
 static struct i2c_algorithm saa7134_algo = {
-        .name          = "saa7134",
-        .id            = I2C_ALGO_SAA7134,
        .master_xfer   = saa7134_i2c_xfer,
        .algo_control  = algo_control,
        .functionality = functionality,
@@ -382,14 +380,14 @@ static struct i2c_adapter saa7134_adap_template = {
 #ifdef I2C_CLASS_TV_ANALOG
        .class         = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("saa7134"),
+        .name          = "saa7134",
-        .id            = I2C_ALGO_SAA7134,
+        .id            = I2C_HW_SAA7134,
        .algo          = &saa7134_algo,
        .client_register = attach_inform,
 };
 static struct i2c_client saa7134_client_template = {
-        I2C_DEVNAME("saa7134 internal"),
+        .name   = "saa7134 internal",
 };
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 108e7a4a0273..e93412f4407c 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -387,7 +387,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver i2c_driver_saa7185;
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 7cb1fb3e66f9..255b6088ebf9 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -328,7 +328,7 @@ static int tda7432_probe(struct i2c_adapter *adap)
        if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, tda7432_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                return i2c_probe(adap, &addr_data, tda7432_attach);
 #endif
        return 0;
@@ -513,7 +513,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda7432"),
+        .name       = "tda7432",
        .driver     = &driver,
 };
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index c29bdfc3244e..1794686612c6 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -205,7 +205,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                return -ENODEV;
        }
@@ -231,7 +231,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template = {
-        I2C_DEVNAME("tda9840"),
+        .name = "tda9840",
        .driver = &driver,
 };
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 566e1a5ca135..7e3dcdb262b0 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -262,7 +262,7 @@ static int tda9875_probe(struct i2c_adapter *adap)
        if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, tda9875_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                return i2c_probe(adap, &addr_data, tda9875_attach);
 #endif
        return 0;
@@ -384,7 +384,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda9875"),
+        .name      = "tda9875",
        .driver    = &driver,
 };
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index a28a395d6dfe..d60fc562aecd 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -618,9 +618,9 @@ static int tda9887_probe(struct i2c_adapter *adap)
                return i2c_probe(adap, &addr_data, tda9887_attach);
 #else
        switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
+        case I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
+        case I2C_HW_B_RIVA:
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_SAA7134:
                return i2c_probe(adap, &addr_data, tda9887_attach);
                break;
        }
@@ -793,7 +793,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("tda9887"),
+        .name      = "tda9887",
        .flags     = I2C_CLIENT_ALLOW_USE,
        .driver    = &driver,
 };
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index b44db8a7b94d..ee3688348b66 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -86,7 +86,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                return -ENODEV;
        }
@@ -200,7 +200,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template = {
-        I2C_DEVNAME("tea6415c"),
+        .name = "tea6415c",
        .driver = &driver,
 };
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index 48d4db7d507b..17975c19da5e 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -135,7 +135,7 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
 static int attach(struct i2c_adapter *adapter)
 {
        /* let's see whether this is a know adapter we can attach to */
-        if (adapter->id != I2C_ALGO_SAA7146) {
+        if (adapter->id != I2C_HW_SAA7146) {
                dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id);
                return -ENODEV;
        }
@@ -177,7 +177,7 @@ static struct i2c_driver driver = {
 };
 static struct i2c_client client_template = {
-        I2C_DEVNAME("tea6420"),
+        .name = "tea6420",
        .driver = &driver,
 };
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 7d825e510ffd..79203595b9c1 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -41,7 +41,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c     = normal_i2c,
        .probe          = &ignore,
        .ignore         = &ignore,
-        .force          = &ignore,
 };
 /* ---------------------------------------------------------------------- */
@@ -166,7 +165,7 @@ static int
 tuner_probe(struct i2c_adapter *adap)
 {
        this_adap = 0;
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_LP))
+        if (adap->id == I2C_HW_B_LP)
                return i2c_probe(adap, &addr_data, tuner_attach);
        return 0;
 }
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index a155e99a263b..3b1893c2ae3b 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -709,7 +709,7 @@ static struct i2c_driver driver = {
                   },
 };
 static struct i2c_client client_template = {
-        I2C_DEVNAME("(tuner unset)"),
+        .name = "(tuner unset)",
        .flags = I2C_CLIENT_ALLOW_USE,
        .driver = &driver,
 };
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index f42a1efa8fcf..258724b2d6d2 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -162,24 +162,23 @@ static int chip_write(struct CHIPSTATE *chip, int subaddr, int val)
        unsigned char buffer[2];
        if (-1 == subaddr) {
-                dprintk("%s: chip_write: 0x%x\n",
+                dprintk("%s: chip_write: 0x%x\n", chip->c.name, val);
-                        i2c_clientname(&chip->c), val);
                chip->shadow.bytes[1] = val;
                buffer[0] = val;
                if (1 != i2c_master_send(&chip->c,buffer,1)) {
                        printk(KERN_WARNING "%s: I/O error (write 0x%x)\n",
-                               i2c_clientname(&chip->c), val);
+                               chip->c.name, val);
                        return -1;
                }
        } else {
                dprintk("%s: chip_write: reg%d=0x%x\n",
-                        i2c_clientname(&chip->c), subaddr, val);
+                        chip->c.name, subaddr, val);
                chip->shadow.bytes[subaddr+1] = val;
                buffer[0] = subaddr;
                buffer[1] = val;
                if (2 != i2c_master_send(&chip->c,buffer,2)) {
                        printk(KERN_WARNING "%s: I/O error (write reg%d=0x%x)\n",
-                               i2c_clientname(&chip->c), subaddr, val);
+                               chip->c.name, subaddr, val);
                        return -1;
                }
        }
@@ -203,11 +202,10 @@ static int chip_read(struct CHIPSTATE *chip)
        unsigned char buffer;
        if (1 != i2c_master_recv(&chip->c,&buffer,1)) {
-                printk(KERN_WARNING "%s: I/O error (read)\n",
+                printk(KERN_WARNING "%s: I/O error (read)\n", chip->c.name);
-                       i2c_clientname(&chip->c));
                return -1;
        }
-        dprintk("%s: chip_read: 0x%x\n",i2c_clientname(&chip->c),buffer);
+        dprintk("%s: chip_read: 0x%x\n", chip->c.name, buffer);
        return buffer;
 }
@@ -222,12 +220,11 @@ static int chip_read2(struct CHIPSTATE *chip, int subaddr)
        write[0] = subaddr;
        if (2 != i2c_transfer(chip->c.adapter,msgs,2)) {
-                printk(KERN_WARNING "%s: I/O error (read2)\n",
+                printk(KERN_WARNING "%s: I/O error (read2)\n", chip->c.name);
-                       i2c_clientname(&chip->c));
                return -1;
        }
        dprintk("%s: chip_read2: reg%d=0x%x\n",
-                i2c_clientname(&chip->c),subaddr,read[0]);
+                chip->c.name, subaddr, read[0]);
        return read[0];
 }
@@ -240,7 +237,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
        /* update our shadow register set; print bytes if (debug > 0) */
        dprintk("%s: chip_cmd(%s): reg=%d, data:",
-                i2c_clientname(&chip->c),name,cmd->bytes[0]);
+                chip->c.name, name, cmd->bytes[0]);
        for (i = 1; i < cmd->count; i++) {
                dprintk(" 0x%x",cmd->bytes[i]);
                chip->shadow.bytes[i+cmd->bytes[0]] = cmd->bytes[i];
@@ -249,7 +246,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
        /* send data to the chip */
        if (cmd->count != i2c_master_send(&chip->c,cmd->bytes,cmd->count)) {
-                printk(KERN_WARNING "%s: I/O error (%s)\n", i2c_clientname(&chip->c), name);
+                printk(KERN_WARNING "%s: I/O error (%s)\n", chip->c.name, name);
                return -1;
        }
        return 0;
@@ -274,9 +271,9 @@ static int chip_thread(void *data)
        struct CHIPSTATE *chip = data;
        struct CHIPDESC  *desc = chiplist + chip->type;
-        daemonize("%s",i2c_clientname(&chip->c));
+        daemonize("%s", chip->c.name);
        allow_signal(SIGTERM);
-        dprintk("%s: thread started\n", i2c_clientname(&chip->c));
+        dprintk("%s: thread started\n", chip->c.name);
        for (;;) {
                add_wait_queue(&chip->wq, &wait);
@@ -288,7 +285,7 @@ static int chip_thread(void *data)
                try_to_freeze();
                if (chip->done || signal_pending(current))
                        break;
-                dprintk("%s: thread wakeup\n", i2c_clientname(&chip->c));
+                dprintk("%s: thread wakeup\n", chip->c.name);
                /* don't do anything for radio or if mode != auto */
                if (chip->norm == VIDEO_MODE_RADIO || chip->mode != 0)
@@ -301,7 +298,7 @@ static int chip_thread(void *data)
                mod_timer(&chip->wt, jiffies+2*HZ);
        }
-        dprintk("%s: thread exiting\n", i2c_clientname(&chip->c));
+        dprintk("%s: thread exiting\n", chip->c.name);
        complete_and_exit(&chip->texit, 0);
        return 0;
 }
@@ -314,7 +311,7 @@ static void generic_checkmode(struct CHIPSTATE *chip)
        if (mode == chip->prevmode)
            return;
-        dprintk("%s: thread checkmode\n", i2c_clientname(&chip->c));
+        dprintk("%s: thread checkmode\n", chip->c.name);
        chip->prevmode = mode;
        if (mode & VIDEO_SOUND_STEREO)
@@ -1098,7 +1095,7 @@ static int tda8425_initialize(struct CHIPSTATE *chip)
                            /* extern   */ TDA8425_S1_CH1, /* intern */ TDA8425_S1_OFF,
                            /* off      */ TDA8425_S1_OFF, /* on     */ TDA8425_S1_CH2};
-        if (chip->c.adapter->id == (I2C_ALGO_BIT | I2C_HW_B_RIVA)) {
+        if (chip->c.adapter->id == I2C_HW_B_RIVA) {
                memcpy (desc->inputmap, inputmap, sizeof (inputmap));
        }
        return 0;
@@ -1501,7 +1498,7 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
        /* fill required data structures */
-        strcpy(i2c_clientname(&chip->c),desc->name);
+        strcpy(chip->c.name, desc->name);
        chip->type = desc-chiplist;
        chip->shadow.count = desc->registers+1;
        chip->prevmode = -1;
@@ -1538,7 +1535,7 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                chip->tpid = kernel_thread(chip_thread,(void *)chip,0);
                if (chip->tpid < 0)
                        printk(KERN_WARNING "%s: kernel_thread() failed\n",
-                               i2c_clientname(&chip->c));
+                               chip->c.name);
                wake_up_interruptible(&chip->wq);
        }
        return 0;
@@ -1548,16 +1545,16 @@ static int chip_probe(struct i2c_adapter *adap)
 {
        /* don't attach on saa7146 based cards,
           because dedicated drivers are used */
-        if ((adap->id & I2C_ALGO_SAA7146))
+        if (adap->id == I2C_HW_SAA7146)
                return 0;
 #ifdef I2C_CLASS_TV_ANALOG
        if (adap->class & I2C_CLASS_TV_ANALOG)
                return i2c_probe(adap, &addr_data, chip_attach);
 #else
        switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
+        case I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
+        case I2C_HW_B_RIVA:
-        case I2C_ALGO_SAA7134:
+        case I2C_HW_SAA7134:
                return i2c_probe(adap, &addr_data, chip_attach);
        }
 #endif
@@ -1591,7 +1588,7 @@ static int chip_command(struct i2c_client *client,
        struct CHIPSTATE *chip = i2c_get_clientdata(client);
        struct CHIPDESC  *desc = chiplist + chip->type;
-        dprintk("%s: chip_command 0x%x\n",i2c_clientname(&chip->c),cmd);
+        dprintk("%s: chip_command 0x%x\n", chip->c.name, cmd);
        switch (cmd) {
        case AUDC_SET_INPUT:
@@ -1702,7 +1699,7 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
-        I2C_DEVNAME("(unset)"),
+        .name       = "(unset)",
        .flags      = I2C_CLIENT_ALLOW_USE,
        .driver     = &driver,
 };
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 127ec38ebd60..3c3356a01cc6 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -534,7 +534,7 @@ static int
 tveeprom_attach_adapter (struct i2c_adapter *adapter)
 {
        dprintk(1,"%s: id 0x%x\n",__FUNCTION__,adapter->id);
-        if (adapter->id != (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adapter->id != I2C_HW_B_BT848)
                return 0;
        return i2c_probe(adapter, &addr_data, tveeprom_detect_client);
 }
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 51b99cdbf29e..a43301a154af 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -91,7 +91,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
        if (cmd == SOUND_MIXER_INFO) {
                mixer_info info;
                strlcpy(info.id, "tv card", sizeof(info.id));
-                strlcpy(info.name, i2c_clientname(client), sizeof(info.name));
+                strlcpy(info.name, client->name, sizeof(info.name));
                info.modify_counter = 42 /* FIXME */;
                if (copy_to_user(argp, &info, sizeof(info)))
                        return -EFAULT;
@@ -100,7 +100,7 @@ static int tvmixer_ioctl(struct inode *inode, struct file *file, unsigned int cm
        if (cmd == SOUND_OLD_MIXER_INFO) {
                _old_mixer_info info;
                strlcpy(info.id, "tv card", sizeof(info.id));
-                strlcpy(info.name, i2c_clientname(client), sizeof(info.name));
+                strlcpy(info.name, client->name, sizeof(info.name));
                if (copy_to_user(argp, &info, sizeof(info)))
                        return -EFAULT;
                return 0;
@@ -276,9 +276,9 @@ static int tvmixer_clients(struct i2c_client *client)
 #else
        /* TV card ??? */
        switch (client->adapter->id) {
-        case I2C_ALGO_BIT | I2C_HW_SMBUS_VOODOO3:
+        case I2C_HW_SMBUS_VOODOO3:
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
+        case I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
+        case I2C_HW_B_RIVA:
                /* ok, have a look ... */
                break;
        default:
@@ -295,7 +295,7 @@ static int tvmixer_clients(struct i2c_client *client)
                        devices[i].dev = NULL;
                        devices[i].minor = -1;
                        printk("tvmixer: %s unregistered (#1)\n",
-                               i2c_clientname(client));
+                               client->name);
                        return 0;
                }
        }
@@ -354,7 +354,7 @@ static void __exit tvmixer_cleanup_module(void)
                if (devices[i].minor != -1) {
                        unregister_sound_mixer(devices[i].minor);
                        printk("tvmixer: %s unregistered (#2)\n",
-                               i2c_clientname(devices[i].dev));
+                               devices[i].dev->name);
                }
        }
 }
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 5dbd9f6bf353..4437bdebe24f 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -576,7 +576,6 @@ static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
        .probe                  = &ignore,
        .ignore                 = &ignore,
-        .force                  = &ignore,
 };
 static struct i2c_driver vpx3220_i2c_driver;
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c
index 25743085b2d5..eed2acea1779 100644
--- a/drivers/media/video/zoran_card.c
+++ b/drivers/media/video/zoran_card.c
@@ -737,7 +737,7 @@ static struct i2c_algo_bit_data zoran_i2c_bit_data_template = {
 };
 static struct i2c_adapter zoran_i2c_adapter_template = {
-        I2C_DEVNAME("zr36057"),
+        .name = "zr36057",
        .id = I2C_HW_B_ZR36067,
        .algo = NULL,
        .client_register = zoran_i2c_client_register,
diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c
index ca9f3a30634f..f36c0b6c6e36 100644
--- a/drivers/usb/media/w9968cf.c
+++ b/drivers/usb/media/w9968cf.c
@@ -1523,7 +1523,6 @@ static u32 w9968cf_i2c_func(struct i2c_adapter* adap)
 static int w9968cf_i2c_attach_inform(struct i2c_client* client)
 {
        struct w9968cf_device* cam = i2c_get_adapdata(client->adapter);
-        const char* clientname = i2c_clientname(client);
        int id = client->driver->id, err = 0;
        if (id == I2C_DRIVERID_OVCAMCHIP) {
@@ -1535,12 +1534,12 @@ static int w9968cf_i2c_attach_inform(struct i2c_client* client)
                }
        } else {
                DBG(4, "Rejected client [%s] with driver [%s]", 
-                    clientname, client->driver->name)
+                    client->name, client->driver->name)
                return -EINVAL;
        }
        DBG(5, "I2C attach client [%s] with driver [%s]",
-            clientname, client->driver->name)
+            client->name, client->driver->name)
        return 0;
 }
@@ -1549,12 +1548,11 @@ static int w9968cf_i2c_attach_inform(struct i2c_client* client)
 static int w9968cf_i2c_detach_inform(struct i2c_client* client)
 {
        struct w9968cf_device* cam = i2c_get_adapdata(client->adapter);
-        const char* clientname = i2c_clientname(client);
        if (cam->sensor_client == client)
                cam->sensor_client = NULL;
-        DBG(5, "I2C detach client [%s]", clientname)
+        DBG(5, "I2C detach client [%s]", client->name)
        return 0;
 }
@@ -1573,15 +1571,13 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
        int err = 0;
        static struct i2c_algorithm algo = {
-                .name =          "W996[87]CF algorithm",
-                .id =            I2C_ALGO_SMBUS,
                .smbus_xfer =    w9968cf_i2c_smbus_xfer,
                .algo_control =  w9968cf_i2c_control,
                .functionality = w9968cf_i2c_func,
        };
        static struct i2c_adapter adap = {
-                .id =                I2C_ALGO_SMBUS | I2C_HW_SMBUS_W9968CF,
+                .id =                I2C_HW_SMBUS_W9968CF,
                .class =             I2C_CLASS_CAM_DIGITAL,
                .owner =             THIS_MODULE,
                .client_register =   w9968cf_i2c_attach_inform,
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c
index 762244164c81..a9d0414e4655 100644
--- a/drivers/video/aty/radeon_i2c.c
+++ b/drivers/video/aty/radeon_i2c.c
@@ -75,7 +75,7 @@ static int radeon_setup_i2c_bus(struct radeon_i2c_chan *chan, const char *name)
        strcpy(chan->adapter.name, name);
        chan->adapter.owner             = THIS_MODULE;
-        chan->adapter.id                = I2C_ALGO_ATI;
+        chan->adapter.id                = I2C_HW_B_RADEON;
        chan->adapter.algo_data         = &chan->algo;
        chan->adapter.dev.parent        = &chan->rinfo->pdev->dev;
        chan->algo.setsda               = radeon_gpio_setsda;
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 67f85344f0cc..ad60bbb16cdf 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1271,7 +1271,7 @@ ERROR0:;
 }
 static int maven_attach_adapter(struct i2c_adapter* adapter) {
-        if (adapter->id == (I2C_ALGO_BIT | I2C_HW_B_G400))
+        if (adapter->id == I2C_HW_B_G400)
                return i2c_probe(adapter, &addr_data, &maven_detect_client);
        return 0;
 }
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
index 3757c1407c19..1a91bffdda26 100644
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -90,14 +90,13 @@ static int nvidia_gpio_getsda(void *data)
        return val;
 }
-#define I2C_ALGO_NVIDIA   0x0e0000
 static int nvidia_setup_i2c_bus(struct nvidia_i2c_chan *chan, const char *name)
 {
        int rc;
        strcpy(chan->adapter.name, name);
        chan->adapter.owner = THIS_MODULE;
-        chan->adapter.id = I2C_ALGO_NVIDIA;
+        chan->adapter.id = I2C_HW_B_NVIDIA;
        chan->adapter.algo_data = &chan->algo;
        chan->adapter.dev.parent = &chan->par->pci_dev->dev;
        chan->algo.setsda = nvidia_gpio_setsda;
diff --git a/drivers/video/riva/rivafb-i2c.c b/drivers/video/riva/rivafb-i2c.c
index da1334dfd51d..77151d8e0766 100644
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
@@ -92,14 +92,13 @@ static int riva_gpio_getsda(void* data)
        return val;
 }
-#define I2C_ALGO_RIVA   0x0e0000
 static int riva_setup_i2c_bus(struct riva_i2c_chan *chan, const char *name)
 {
        int rc;
        strcpy(chan->adapter.name, name);
        chan->adapter.owner             = THIS_MODULE;
-        chan->adapter.id                = I2C_ALGO_RIVA;
+        chan->adapter.id                = I2C_HW_B_RIVA;
        chan->adapter.algo_data         = &chan->algo;
        chan->adapter.dev.parent        = &chan->par->pdev->dev;
        chan->algo.setsda               = riva_gpio_setsda;
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
index 024a0cecff15..847698b5cfe7 100644
--- a/drivers/video/savage/savagefb-i2c.c
+++ b/drivers/video/savage/savagefb-i2c.c
@@ -137,7 +137,6 @@ static int prosavage_gpio_getsda(void* data)
        return (0 != (GET_CR_DATA(chan->ioaddr) & PROSAVAGE_I2C_SDA_IN));
 }
-#define I2C_ALGO_SAVAGE   0x0f0000
 static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
                                const char *name)
 {
@@ -147,7 +146,7 @@ static int savage_setup_i2c_bus(struct savagefb_i2c_chan *chan,
        if (add_bus && chan->par) {
                strcpy(chan->adapter.name, name);
                chan->adapter.owner             = THIS_MODULE;
-                chan->adapter.id                = I2C_ALGO_SAVAGE;
+                chan->adapter.id                = I2C_HW_B_SAVAGE;
                chan->adapter.algo_data         = &chan->algo;
                chan->adapter.dev.parent        = &chan->par->pcidev->dev;
                chan->algo.udelay               = 40;
author	Linus Torvalds <torvalds@evo.osdl.org>	2005-09-06 03:31:02 -0400
committer	Linus Torvalds <torvalds@evo.osdl.org>	2005-09-06 03:31:02 -0400
commit	8566cfc9fe0934f52ddedc12b083176116c13978 (patch)
tree	b0f92fd0982a4dabaa2c108f4f1d130d2cff6798 /drivers
parent	7bdb2b6aca356c765bb697a4e9e7599357ee1542 (diff)
parent	77ae84554cc0178e03862391599a0cedf96fa4c4 (diff)