hwmon: driver for Texas Instruments amc6821 chip
[safe/jmp/linux-2.6] / drivers / hwmon / w83792d.c
index 4ef884c..679718e 100644 (file)
@@ -3,7 +3,7 @@
                 monitoring
     Copyright (C) 2004, 2005 Winbond Electronics Corp.
                         Chunhao Huang <DZShen@Winbond.com.tw>,
-                        Rudolf Marek <r.marek@sh.cvut.cz>
+                        Rudolf Marek <r.marek@assembler.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
@@ -35,7 +35,6 @@
     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/hwmon-sysfs.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
+#include <linux/sysfs.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END };
+static const 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: "
+
+static unsigned short force_subclients[4];
+module_param_array(force_subclients, short, NULL, 0);
+MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "
                        "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 
 static int init;
@@ -266,9 +269,7 @@ DIV_TO_REG(long val)
 }
 
 struct w83792d_data {
-       struct i2c_client client;
-       struct class_device *class_dev;
-       enum chips type;
+       struct device *hwmon_dev;
 
        struct mutex update_lock;
        char valid;             /* !=0 if following fields are valid */
@@ -298,9 +299,11 @@ struct w83792d_data {
        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_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id);
+static int w83792d_detect(struct i2c_client *client,
+                         struct i2c_board_info *info);
+static int w83792d_remove(struct i2c_client *client);
 static struct w83792d_data *w83792d_update_device(struct device *dev);
 
 #ifdef DEBUG
@@ -309,12 +312,22 @@ static void w83792d_print_debug(struct w83792d_data *data, struct device *dev);
 
 static void w83792d_init_client(struct i2c_client *client);
 
+static const struct i2c_device_id w83792d_id[] = {
+       { "w83792d", 0 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, w83792d_id);
+
 static struct i2c_driver w83792d_driver = {
+       .class          = I2C_CLASS_HWMON,
        .driver = {
                .name = "w83792d",
        },
-       .attach_adapter = w83792d_attach_adapter,
-       .detach_client = w83792d_detach_client,
+       .probe          = w83792d_probe,
+       .remove         = w83792d_remove,
+       .id_table       = w83792d_id,
+       .detect         = w83792d_detect,
+       .address_list   = normal_i2c,
 };
 
 static inline long in_count_from_reg(int nr, struct w83792d_data *data)
@@ -382,41 +395,6 @@ static ssize_t store_in_##reg (struct device *dev, \
 store_in_reg(MIN, min);
 store_in_reg(MAX, max);
 
-static struct sensor_device_attribute sda_in_input[] = {
-       SENSOR_ATTR(in0_input, S_IRUGO, show_in, NULL, 0),
-       SENSOR_ATTR(in1_input, S_IRUGO, show_in, NULL, 1),
-       SENSOR_ATTR(in2_input, S_IRUGO, show_in, NULL, 2),
-       SENSOR_ATTR(in3_input, S_IRUGO, show_in, NULL, 3),
-       SENSOR_ATTR(in4_input, S_IRUGO, show_in, NULL, 4),
-       SENSOR_ATTR(in5_input, S_IRUGO, show_in, NULL, 5),
-       SENSOR_ATTR(in6_input, S_IRUGO, show_in, NULL, 6),
-       SENSOR_ATTR(in7_input, S_IRUGO, show_in, NULL, 7),
-       SENSOR_ATTR(in8_input, S_IRUGO, show_in, NULL, 8),
-};
-static struct sensor_device_attribute sda_in_min[] = {
-       SENSOR_ATTR(in0_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 0),
-       SENSOR_ATTR(in1_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 1),
-       SENSOR_ATTR(in2_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 2),
-       SENSOR_ATTR(in3_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 3),
-       SENSOR_ATTR(in4_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 4),
-       SENSOR_ATTR(in5_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 5),
-       SENSOR_ATTR(in6_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 6),
-       SENSOR_ATTR(in7_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 7),
-       SENSOR_ATTR(in8_min, S_IWUSR | S_IRUGO, show_in_min, store_in_min, 8),
-};
-static struct sensor_device_attribute sda_in_max[] = {
-       SENSOR_ATTR(in0_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 0),
-       SENSOR_ATTR(in1_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 1),
-       SENSOR_ATTR(in2_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 2),
-       SENSOR_ATTR(in3_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 3),
-       SENSOR_ATTR(in4_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 4),
-       SENSOR_ATTR(in5_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 5),
-       SENSOR_ATTR(in6_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 6),
-       SENSOR_ATTR(in7_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 7),
-       SENSOR_ATTR(in8_max, S_IWUSR | S_IRUGO, show_in_max, store_in_max, 8),
-};
-
-
 #define show_fan_reg(reg) \
 static ssize_t show_##reg (struct device *dev, struct device_attribute *attr, \
                        char *buf) \
@@ -463,7 +441,7 @@ show_fan_div(struct device *dev, struct device_attribute *attr,
 
 /* 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
+   least surprise; 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,
@@ -500,35 +478,6 @@ store_fan_div(struct device *dev, struct device_attribute *attr,
        return count;
 }
 
-static struct sensor_device_attribute sda_fan_input[] = {
-       SENSOR_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 1),
-       SENSOR_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 2),
-       SENSOR_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 3),
-       SENSOR_ATTR(fan4_input, S_IRUGO, show_fan, NULL, 4),
-       SENSOR_ATTR(fan5_input, S_IRUGO, show_fan, NULL, 5),
-       SENSOR_ATTR(fan6_input, S_IRUGO, show_fan, NULL, 6),
-       SENSOR_ATTR(fan7_input, S_IRUGO, show_fan, NULL, 7),
-};
-static struct sensor_device_attribute sda_fan_min[] = {
-       SENSOR_ATTR(fan1_min, S_IWUSR | S_IRUGO, show_fan_min, store_fan_min, 1),
-       SENSOR_ATTR(fan2_min, S_IWUSR | S_IRUGO, show_fan_min, store_fan_min, 2),
-       SENSOR_ATTR(fan3_min, S_IWUSR | S_IRUGO, show_fan_min, store_fan_min, 3),
-       SENSOR_ATTR(fan4_min, S_IWUSR | S_IRUGO, show_fan_min, store_fan_min, 4),
-       SENSOR_ATTR(fan5_min, S_IWUSR | S_IRUGO, show_fan_min, store_fan_min, 5),
-       SENSOR_ATTR(fan6_min, S_IWUSR | S_IRUGO, show_fan_min, store_fan_min, 6),
-       SENSOR_ATTR(fan7_min, S_IWUSR | S_IRUGO, show_fan_min, store_fan_min, 7),
-};
-static struct sensor_device_attribute sda_fan_div[] = {
-       SENSOR_ATTR(fan1_div, S_IWUSR | S_IRUGO, show_fan_div, store_fan_div, 1),
-       SENSOR_ATTR(fan2_div, S_IWUSR | S_IRUGO, show_fan_div, store_fan_div, 2),
-       SENSOR_ATTR(fan3_div, S_IWUSR | S_IRUGO, show_fan_div, store_fan_div, 3),
-       SENSOR_ATTR(fan4_div, S_IWUSR | S_IRUGO, show_fan_div, store_fan_div, 4),
-       SENSOR_ATTR(fan5_div, S_IWUSR | S_IRUGO, show_fan_div, store_fan_div, 5),
-       SENSOR_ATTR(fan6_div, S_IWUSR | S_IRUGO, show_fan_div, store_fan_div, 6),
-       SENSOR_ATTR(fan7_div, S_IWUSR | S_IRUGO, show_fan_div, store_fan_div, 7),
-};
-
-
 /* read/write the temperature1, includes measured value and limits */
 
 static ssize_t show_temp1(struct device *dev, struct device_attribute *attr,
@@ -596,24 +545,6 @@ static ssize_t store_temp23(struct device *dev, struct device_attribute *attr,
        return count;
 }
 
-static struct sensor_device_attribute_2 sda_temp_input[] = {
-       SENSOR_ATTR_2(temp1_input, S_IRUGO, show_temp1, NULL, 0, 0),
-       SENSOR_ATTR_2(temp2_input, S_IRUGO, show_temp23, NULL, 0, 0),
-       SENSOR_ATTR_2(temp3_input, S_IRUGO, show_temp23, NULL, 1, 0),
-};
-
-static struct sensor_device_attribute_2 sda_temp_max[] = {
-       SENSOR_ATTR_2(temp1_max, S_IRUGO | S_IWUSR, show_temp1, store_temp1, 0, 1),
-       SENSOR_ATTR_2(temp2_max, S_IRUGO | S_IWUSR, show_temp23, store_temp23, 0, 2),
-       SENSOR_ATTR_2(temp3_max, S_IRUGO | S_IWUSR, show_temp23, store_temp23, 1, 2),
-};
-
-static struct sensor_device_attribute_2 sda_temp_max_hyst[] = {
-       SENSOR_ATTR_2(temp1_max_hyst, S_IRUGO | S_IWUSR, show_temp1, store_temp1, 0, 2),
-       SENSOR_ATTR_2(temp2_max_hyst, S_IRUGO | S_IWUSR, show_temp23, store_temp23, 0, 4),
-       SENSOR_ATTR_2(temp3_max_hyst, S_IRUGO | S_IWUSR, show_temp23, store_temp23, 1, 4),
-};
-
 /* 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)
@@ -622,8 +553,14 @@ show_alarms_reg(struct device *dev, struct device_attribute *attr, char *buf)
        return sprintf(buf, "%d\n", data->alarms);
 }
 
-static
-DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
+static ssize_t show_alarm(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->alarms >> nr) & 1);
+}
 
 static ssize_t
 show_pwm(struct device *dev, struct device_attribute *attr,
@@ -716,21 +653,6 @@ store_pwmenable(struct device *dev, struct device_attribute *attr,
        return count;
 }
 
-static struct sensor_device_attribute sda_pwm[] = {
-       SENSOR_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm, store_pwm, 0),
-       SENSOR_ATTR(pwm2, S_IWUSR | S_IRUGO, show_pwm, store_pwm, 1),
-       SENSOR_ATTR(pwm3, S_IWUSR | S_IRUGO, show_pwm, store_pwm, 2),
-};
-static struct sensor_device_attribute sda_pwm_enable[] = {
-       SENSOR_ATTR(pwm1_enable, S_IWUSR | S_IRUGO,
-                   show_pwmenable, store_pwmenable, 1),
-       SENSOR_ATTR(pwm2_enable, S_IWUSR | S_IRUGO,
-                   show_pwmenable, store_pwmenable, 2),
-       SENSOR_ATTR(pwm3_enable, S_IWUSR | S_IRUGO,
-                   show_pwmenable, store_pwmenable, 3),
-};
-
-
 static ssize_t
 show_pwm_mode(struct device *dev, struct device_attribute *attr,
                        char *buf)
@@ -768,16 +690,6 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
        return count;
 }
 
-static struct sensor_device_attribute sda_pwm_mode[] = {
-       SENSOR_ATTR(pwm1_mode, S_IWUSR | S_IRUGO,
-                   show_pwm_mode, store_pwm_mode, 0),
-       SENSOR_ATTR(pwm2_mode, S_IWUSR | S_IRUGO,
-                   show_pwm_mode, store_pwm_mode, 1),
-       SENSOR_ATTR(pwm3_mode, S_IWUSR | S_IRUGO,
-                   show_pwm_mode, store_pwm_mode, 2),
-};
-
-
 static ssize_t
 show_regs_chassis(struct device *dev, struct device_attribute *attr,
                        char *buf)
@@ -786,8 +698,6 @@ show_regs_chassis(struct device *dev, struct device_attribute *attr,
        return sprintf(buf, "%d\n", data->chassis);
 }
 
-static DEVICE_ATTR(chassis, S_IRUGO, show_regs_chassis, NULL);
-
 static ssize_t
 show_chassis_clear(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -816,9 +726,6 @@ store_chassis_clear(struct device *dev, struct device_attribute *attr,
        return count;
 }
 
-static DEVICE_ATTR(chassis_clear, S_IRUGO | S_IWUSR,
-               show_chassis_clear, store_chassis_clear);
-
 /* For Smart Fan I / Thermal Cruise */
 static ssize_t
 show_thermal_cruise(struct device *dev, struct device_attribute *attr,
@@ -854,15 +761,6 @@ store_thermal_cruise(struct device *dev, struct device_attribute *attr,
        return count;
 }
 
-static struct sensor_device_attribute sda_thermal_cruise[] = {
-       SENSOR_ATTR(thermal_cruise1, S_IWUSR | S_IRUGO,
-                   show_thermal_cruise, store_thermal_cruise, 1),
-       SENSOR_ATTR(thermal_cruise2, S_IWUSR | S_IRUGO,
-                   show_thermal_cruise, store_thermal_cruise, 2),
-       SENSOR_ATTR(thermal_cruise3, S_IWUSR | S_IRUGO,
-                   show_thermal_cruise, store_thermal_cruise, 3),
-};
-
 /* For Smart Fan I/Thermal Cruise and Smart Fan II */
 static ssize_t
 show_tolerance(struct device *dev, struct device_attribute *attr,
@@ -902,15 +800,6 @@ store_tolerance(struct device *dev, struct device_attribute *attr,
        return count;
 }
 
-static struct sensor_device_attribute sda_tolerance[] = {
-       SENSOR_ATTR(tolerance1, S_IWUSR | S_IRUGO,
-                   show_tolerance, store_tolerance, 1),
-       SENSOR_ATTR(tolerance2, S_IWUSR | S_IRUGO,
-                   show_tolerance, store_tolerance, 2),
-       SENSOR_ATTR(tolerance3, S_IWUSR | S_IRUGO,
-                   show_tolerance, store_tolerance, 3),
-};
-
 /* For Smart Fan II */
 static ssize_t
 show_sf2_point(struct device *dev, struct device_attribute *attr,
@@ -947,36 +836,6 @@ store_sf2_point(struct device *dev, struct device_attribute *attr,
        return count;
 }
 
-static struct sensor_device_attribute_2 sda_sf2_point[] = {
-       SENSOR_ATTR_2(sf2_point1_fan1, S_IRUGO | S_IWUSR,
-                     show_sf2_point, store_sf2_point, 1, 1),
-       SENSOR_ATTR_2(sf2_point2_fan1, S_IRUGO | S_IWUSR,
-                     show_sf2_point, store_sf2_point, 2, 1),
-       SENSOR_ATTR_2(sf2_point3_fan1, S_IRUGO | S_IWUSR,
-                     show_sf2_point, store_sf2_point, 3, 1),
-       SENSOR_ATTR_2(sf2_point4_fan1, S_IRUGO | S_IWUSR,
-                     show_sf2_point, store_sf2_point, 4, 1),
-
-       SENSOR_ATTR_2(sf2_point1_fan2, S_IRUGO | S_IWUSR,
-                     show_sf2_point, store_sf2_point, 1, 2),
-       SENSOR_ATTR_2(sf2_point2_fan2, S_IRUGO | S_IWUSR,
-                     show_sf2_point, store_sf2_point, 2, 2),
-       SENSOR_ATTR_2(sf2_point3_fan2, S_IRUGO | S_IWUSR,
-                     show_sf2_point, store_sf2_point, 3, 2),
-       SENSOR_ATTR_2(sf2_point4_fan2, S_IRUGO | S_IWUSR,
-                     show_sf2_point, store_sf2_point, 4, 2),
-
-       SENSOR_ATTR_2(sf2_point1_fan3, S_IRUGO | S_IWUSR,
-                     show_sf2_point, store_sf2_point, 1, 3),
-       SENSOR_ATTR_2(sf2_point2_fan3, S_IRUGO | S_IWUSR,
-                     show_sf2_point, store_sf2_point, 2, 3),
-       SENSOR_ATTR_2(sf2_point3_fan3, S_IRUGO | S_IWUSR,
-                     show_sf2_point, store_sf2_point, 3, 3),
-       SENSOR_ATTR_2(sf2_point4_fan3, S_IRUGO | S_IWUSR,
-                     show_sf2_point, store_sf2_point, 4, 3),
-};
-
-
 static ssize_t
 show_sf2_level(struct device *dev, struct device_attribute *attr,
                char *buf)
@@ -1017,76 +876,14 @@ store_sf2_level(struct device *dev, struct device_attribute *attr,
        return count;
 }
 
-static struct sensor_device_attribute_2 sda_sf2_level[] = {
-       SENSOR_ATTR_2(sf2_level1_fan1, S_IRUGO | S_IWUSR,
-                     show_sf2_level, store_sf2_level, 1, 1),
-       SENSOR_ATTR_2(sf2_level2_fan1, S_IRUGO | S_IWUSR,
-                     show_sf2_level, store_sf2_level, 2, 1),
-       SENSOR_ATTR_2(sf2_level3_fan1, S_IRUGO | S_IWUSR,
-                     show_sf2_level, store_sf2_level, 3, 1),
-
-       SENSOR_ATTR_2(sf2_level1_fan2, S_IRUGO | S_IWUSR,
-                     show_sf2_level, store_sf2_level, 1, 2),
-       SENSOR_ATTR_2(sf2_level2_fan2, S_IRUGO | S_IWUSR,
-                     show_sf2_level, store_sf2_level, 2, 2),
-       SENSOR_ATTR_2(sf2_level3_fan2, S_IRUGO | S_IWUSR,
-                     show_sf2_level, store_sf2_level, 3, 2),
-
-       SENSOR_ATTR_2(sf2_level1_fan3, S_IRUGO | S_IWUSR,
-                     show_sf2_level, store_sf2_level, 1, 3),
-       SENSOR_ATTR_2(sf2_level2_fan3, S_IRUGO | S_IWUSR,
-                     show_sf2_level, store_sf2_level, 2, 3),
-       SENSOR_ATTR_2(sf2_level3_fan3, S_IRUGO | S_IWUSR,
-                     show_sf2_level, store_sf2_level, 3, 3),
-};
 
-/* 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 = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-       if (!(sub_client)) {
-               return -ENOMEM;
-       }
-       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)
+w83792d_detect_subclients(struct i2c_client *new_client)
 {
        int i, id, err;
+       int address = new_client->addr;
        u8 val;
+       struct i2c_adapter *adapter = new_client->adapter;
        struct w83792d_data *data = i2c_get_clientdata(new_client);
 
        id = i2c_adapter_id(adapter);
@@ -1108,10 +905,7 @@ w83792d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
 
        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;
+               data->lm75[0] = i2c_new_dummy(adapter, 0x48 + (val & 0x7));
        }
        if (!(val & 0x80)) {
                if ((data->lm75[0] != NULL) &&
@@ -1121,10 +915,8 @@ w83792d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
                        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;
+               data->lm75[1] = i2c_new_dummy(adapter,
+                                             0x48 + ((val >> 4) & 0x7));
        }
 
        return 0;
@@ -1132,133 +924,408 @@ w83792d_detect_subclients(struct i2c_adapter *adapter, int address, int kind,
 /* Undo inits in case of errors */
 
 ERROR_SC_1:
-       if (data->lm75[0] != NULL) {
-               i2c_detach_client(data->lm75[0]);
-               kfree(data->lm75[0]);
-       }
+       if (data->lm75[0] != NULL)
+               i2c_unregister_device(data->lm75[0]);
 ERROR_SC_0:
        return err;
 }
 
-static void device_create_file_fan(struct device *dev, int i)
-{
-       device_create_file(dev, &sda_fan_input[i].dev_attr);
-       device_create_file(dev, &sda_fan_div[i].dev_attr);
-       device_create_file(dev, &sda_fan_min[i].dev_attr);
-}
+static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_in, NULL, 0);
+static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_in, NULL, 1);
+static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_in, NULL, 2);
+static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_in, NULL, 3);
+static SENSOR_DEVICE_ATTR(in4_input, S_IRUGO, show_in, NULL, 4);
+static SENSOR_DEVICE_ATTR(in5_input, S_IRUGO, show_in, NULL, 5);
+static SENSOR_DEVICE_ATTR(in6_input, S_IRUGO, show_in, NULL, 6);
+static SENSOR_DEVICE_ATTR(in7_input, S_IRUGO, show_in, NULL, 7);
+static SENSOR_DEVICE_ATTR(in8_input, S_IRUGO, show_in, NULL, 8);
+static SENSOR_DEVICE_ATTR(in0_min, S_IWUSR | S_IRUGO,
+                       show_in_min, store_in_min, 0);
+static SENSOR_DEVICE_ATTR(in1_min, S_IWUSR | S_IRUGO,
+                       show_in_min, store_in_min, 1);
+static SENSOR_DEVICE_ATTR(in2_min, S_IWUSR | S_IRUGO,
+                       show_in_min, store_in_min, 2);
+static SENSOR_DEVICE_ATTR(in3_min, S_IWUSR | S_IRUGO,
+                       show_in_min, store_in_min, 3);
+static SENSOR_DEVICE_ATTR(in4_min, S_IWUSR | S_IRUGO,
+                       show_in_min, store_in_min, 4);
+static SENSOR_DEVICE_ATTR(in5_min, S_IWUSR | S_IRUGO,
+                       show_in_min, store_in_min, 5);
+static SENSOR_DEVICE_ATTR(in6_min, S_IWUSR | S_IRUGO,
+                       show_in_min, store_in_min, 6);
+static SENSOR_DEVICE_ATTR(in7_min, S_IWUSR | S_IRUGO,
+                       show_in_min, store_in_min, 7);
+static SENSOR_DEVICE_ATTR(in8_min, S_IWUSR | S_IRUGO,
+                       show_in_min, store_in_min, 8);
+static SENSOR_DEVICE_ATTR(in0_max, S_IWUSR | S_IRUGO,
+                       show_in_max, store_in_max, 0);
+static SENSOR_DEVICE_ATTR(in1_max, S_IWUSR | S_IRUGO,
+                       show_in_max, store_in_max, 1);
+static SENSOR_DEVICE_ATTR(in2_max, S_IWUSR | S_IRUGO,
+                       show_in_max, store_in_max, 2);
+static SENSOR_DEVICE_ATTR(in3_max, S_IWUSR | S_IRUGO,
+                       show_in_max, store_in_max, 3);
+static SENSOR_DEVICE_ATTR(in4_max, S_IWUSR | S_IRUGO,
+                       show_in_max, store_in_max, 4);
+static SENSOR_DEVICE_ATTR(in5_max, S_IWUSR | S_IRUGO,
+                       show_in_max, store_in_max, 5);
+static SENSOR_DEVICE_ATTR(in6_max, S_IWUSR | S_IRUGO,
+                       show_in_max, store_in_max, 6);
+static SENSOR_DEVICE_ATTR(in7_max, S_IWUSR | S_IRUGO,
+                       show_in_max, store_in_max, 7);
+static SENSOR_DEVICE_ATTR(in8_max, S_IWUSR | S_IRUGO,
+                       show_in_max, store_in_max, 8);
+static SENSOR_DEVICE_ATTR_2(temp1_input, S_IRUGO, show_temp1, NULL, 0, 0);
+static SENSOR_DEVICE_ATTR_2(temp2_input, S_IRUGO, show_temp23, NULL, 0, 0);
+static SENSOR_DEVICE_ATTR_2(temp3_input, S_IRUGO, show_temp23, NULL, 1, 0);
+static SENSOR_DEVICE_ATTR_2(temp1_max, S_IRUGO | S_IWUSR,
+                       show_temp1, store_temp1, 0, 1);
+static SENSOR_DEVICE_ATTR_2(temp2_max, S_IRUGO | S_IWUSR, show_temp23,
+                       store_temp23, 0, 2);
+static SENSOR_DEVICE_ATTR_2(temp3_max, S_IRUGO | S_IWUSR, show_temp23,
+                       store_temp23, 1, 2);
+static SENSOR_DEVICE_ATTR_2(temp1_max_hyst, S_IRUGO | S_IWUSR,
+                       show_temp1, store_temp1, 0, 2);
+static SENSOR_DEVICE_ATTR_2(temp2_max_hyst, S_IRUGO | S_IWUSR,
+                       show_temp23, store_temp23, 0, 4);
+static SENSOR_DEVICE_ATTR_2(temp3_max_hyst, S_IRUGO | S_IWUSR,
+                       show_temp23, store_temp23, 1, 4);
+static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL);
+static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);
+static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);
+static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 4);
+static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 5);
+static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 6);
+static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 7);
+static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 8);
+static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 9);
+static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 10);
+static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 11);
+static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 12);
+static SENSOR_DEVICE_ATTR(fan7_alarm, S_IRUGO, show_alarm, NULL, 15);
+static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 19);
+static SENSOR_DEVICE_ATTR(in8_alarm, S_IRUGO, show_alarm, NULL, 20);
+static SENSOR_DEVICE_ATTR(fan4_alarm, S_IRUGO, show_alarm, NULL, 21);
+static SENSOR_DEVICE_ATTR(fan5_alarm, S_IRUGO, show_alarm, NULL, 22);
+static SENSOR_DEVICE_ATTR(fan6_alarm, S_IRUGO, show_alarm, NULL, 23);
+static DEVICE_ATTR(chassis, S_IRUGO, show_regs_chassis, NULL);
+static DEVICE_ATTR(chassis_clear, S_IRUGO | S_IWUSR,
+                       show_chassis_clear, store_chassis_clear);
+static SENSOR_DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm, store_pwm, 0);
+static SENSOR_DEVICE_ATTR(pwm2, S_IWUSR | S_IRUGO, show_pwm, store_pwm, 1);
+static SENSOR_DEVICE_ATTR(pwm3, S_IWUSR | S_IRUGO, show_pwm, store_pwm, 2);
+static SENSOR_DEVICE_ATTR(pwm1_enable, S_IWUSR | S_IRUGO,
+                       show_pwmenable, store_pwmenable, 1);
+static SENSOR_DEVICE_ATTR(pwm2_enable, S_IWUSR | S_IRUGO,
+                       show_pwmenable, store_pwmenable, 2);
+static SENSOR_DEVICE_ATTR(pwm3_enable, S_IWUSR | S_IRUGO,
+                       show_pwmenable, store_pwmenable, 3);
+static SENSOR_DEVICE_ATTR(pwm1_mode, S_IWUSR | S_IRUGO,
+                       show_pwm_mode, store_pwm_mode, 0);
+static SENSOR_DEVICE_ATTR(pwm2_mode, S_IWUSR | S_IRUGO,
+                       show_pwm_mode, store_pwm_mode, 1);
+static SENSOR_DEVICE_ATTR(pwm3_mode, S_IWUSR | S_IRUGO,
+                       show_pwm_mode, store_pwm_mode, 2);
+static SENSOR_DEVICE_ATTR(tolerance1, S_IWUSR | S_IRUGO,
+                       show_tolerance, store_tolerance, 1);
+static SENSOR_DEVICE_ATTR(tolerance2, S_IWUSR | S_IRUGO,
+                       show_tolerance, store_tolerance, 2);
+static SENSOR_DEVICE_ATTR(tolerance3, S_IWUSR | S_IRUGO,
+                       show_tolerance, store_tolerance, 3);
+static SENSOR_DEVICE_ATTR(thermal_cruise1, S_IWUSR | S_IRUGO,
+                       show_thermal_cruise, store_thermal_cruise, 1);
+static SENSOR_DEVICE_ATTR(thermal_cruise2, S_IWUSR | S_IRUGO,
+                       show_thermal_cruise, store_thermal_cruise, 2);
+static SENSOR_DEVICE_ATTR(thermal_cruise3, S_IWUSR | S_IRUGO,
+                       show_thermal_cruise, store_thermal_cruise, 3);
+static SENSOR_DEVICE_ATTR_2(sf2_point1_fan1, S_IRUGO | S_IWUSR,
+                       show_sf2_point, store_sf2_point, 1, 1);
+static SENSOR_DEVICE_ATTR_2(sf2_point2_fan1, S_IRUGO | S_IWUSR,
+                       show_sf2_point, store_sf2_point, 2, 1);
+static SENSOR_DEVICE_ATTR_2(sf2_point3_fan1, S_IRUGO | S_IWUSR,
+                       show_sf2_point, store_sf2_point, 3, 1);
+static SENSOR_DEVICE_ATTR_2(sf2_point4_fan1, S_IRUGO | S_IWUSR,
+                       show_sf2_point, store_sf2_point, 4, 1);
+static SENSOR_DEVICE_ATTR_2(sf2_point1_fan2, S_IRUGO | S_IWUSR,
+                       show_sf2_point, store_sf2_point, 1, 2);
+static SENSOR_DEVICE_ATTR_2(sf2_point2_fan2, S_IRUGO | S_IWUSR,
+                       show_sf2_point, store_sf2_point, 2, 2);
+static SENSOR_DEVICE_ATTR_2(sf2_point3_fan2, S_IRUGO | S_IWUSR,
+                       show_sf2_point, store_sf2_point, 3, 2);
+static SENSOR_DEVICE_ATTR_2(sf2_point4_fan2, S_IRUGO | S_IWUSR,
+                       show_sf2_point, store_sf2_point, 4, 2);
+static SENSOR_DEVICE_ATTR_2(sf2_point1_fan3, S_IRUGO | S_IWUSR,
+                       show_sf2_point, store_sf2_point, 1, 3);
+static SENSOR_DEVICE_ATTR_2(sf2_point2_fan3, S_IRUGO | S_IWUSR,
+                       show_sf2_point, store_sf2_point, 2, 3);
+static SENSOR_DEVICE_ATTR_2(sf2_point3_fan3, S_IRUGO | S_IWUSR,
+                       show_sf2_point, store_sf2_point, 3, 3);
+static SENSOR_DEVICE_ATTR_2(sf2_point4_fan3, S_IRUGO | S_IWUSR,
+                       show_sf2_point, store_sf2_point, 4, 3);
+static SENSOR_DEVICE_ATTR_2(sf2_level1_fan1, S_IRUGO | S_IWUSR,
+                       show_sf2_level, store_sf2_level, 1, 1);
+static SENSOR_DEVICE_ATTR_2(sf2_level2_fan1, S_IRUGO | S_IWUSR,
+                       show_sf2_level, store_sf2_level, 2, 1);
+static SENSOR_DEVICE_ATTR_2(sf2_level3_fan1, S_IRUGO | S_IWUSR,
+                       show_sf2_level, store_sf2_level, 3, 1);
+static SENSOR_DEVICE_ATTR_2(sf2_level1_fan2, S_IRUGO | S_IWUSR,
+                       show_sf2_level, store_sf2_level, 1, 2);
+static SENSOR_DEVICE_ATTR_2(sf2_level2_fan2, S_IRUGO | S_IWUSR,
+                       show_sf2_level, store_sf2_level, 2, 2);
+static SENSOR_DEVICE_ATTR_2(sf2_level3_fan2, S_IRUGO | S_IWUSR,
+                       show_sf2_level, store_sf2_level, 3, 2);
+static SENSOR_DEVICE_ATTR_2(sf2_level1_fan3, S_IRUGO | S_IWUSR,
+                       show_sf2_level, store_sf2_level, 1, 3);
+static SENSOR_DEVICE_ATTR_2(sf2_level2_fan3, S_IRUGO | S_IWUSR,
+                       show_sf2_level, store_sf2_level, 2, 3);
+static SENSOR_DEVICE_ATTR_2(sf2_level3_fan3, S_IRUGO | S_IWUSR,
+                       show_sf2_level, store_sf2_level, 3, 3);
+static SENSOR_DEVICE_ATTR(fan1_input, S_IRUGO, show_fan, NULL, 1);
+static SENSOR_DEVICE_ATTR(fan2_input, S_IRUGO, show_fan, NULL, 2);
+static SENSOR_DEVICE_ATTR(fan3_input, S_IRUGO, show_fan, NULL, 3);
+static SENSOR_DEVICE_ATTR(fan4_input, S_IRUGO, show_fan, NULL, 4);
+static SENSOR_DEVICE_ATTR(fan5_input, S_IRUGO, show_fan, NULL, 5);
+static SENSOR_DEVICE_ATTR(fan6_input, S_IRUGO, show_fan, NULL, 6);
+static SENSOR_DEVICE_ATTR(fan7_input, S_IRUGO, show_fan, NULL, 7);
+static SENSOR_DEVICE_ATTR(fan1_min, S_IWUSR | S_IRUGO,
+                       show_fan_min, store_fan_min, 1);
+static SENSOR_DEVICE_ATTR(fan2_min, S_IWUSR | S_IRUGO,
+                       show_fan_min, store_fan_min, 2);
+static SENSOR_DEVICE_ATTR(fan3_min, S_IWUSR | S_IRUGO,
+                       show_fan_min, store_fan_min, 3);
+static SENSOR_DEVICE_ATTR(fan4_min, S_IWUSR | S_IRUGO,
+                       show_fan_min, store_fan_min, 4);
+static SENSOR_DEVICE_ATTR(fan5_min, S_IWUSR | S_IRUGO,
+                       show_fan_min, store_fan_min, 5);
+static SENSOR_DEVICE_ATTR(fan6_min, S_IWUSR | S_IRUGO,
+                       show_fan_min, store_fan_min, 6);
+static SENSOR_DEVICE_ATTR(fan7_min, S_IWUSR | S_IRUGO,
+                       show_fan_min, store_fan_min, 7);
+static SENSOR_DEVICE_ATTR(fan1_div, S_IWUSR | S_IRUGO,
+                       show_fan_div, store_fan_div, 1);
+static SENSOR_DEVICE_ATTR(fan2_div, S_IWUSR | S_IRUGO,
+                       show_fan_div, store_fan_div, 2);
+static SENSOR_DEVICE_ATTR(fan3_div, S_IWUSR | S_IRUGO,
+                       show_fan_div, store_fan_div, 3);
+static SENSOR_DEVICE_ATTR(fan4_div, S_IWUSR | S_IRUGO,
+                       show_fan_div, store_fan_div, 4);
+static SENSOR_DEVICE_ATTR(fan5_div, S_IWUSR | S_IRUGO,
+                       show_fan_div, store_fan_div, 5);
+static SENSOR_DEVICE_ATTR(fan6_div, S_IWUSR | S_IRUGO,
+                       show_fan_div, store_fan_div, 6);
+static SENSOR_DEVICE_ATTR(fan7_div, S_IWUSR | S_IRUGO,
+                       show_fan_div, store_fan_div, 7);
+
+static struct attribute *w83792d_attributes_fan[4][5] = {
+       {
+               &sensor_dev_attr_fan4_input.dev_attr.attr,
+               &sensor_dev_attr_fan4_min.dev_attr.attr,
+               &sensor_dev_attr_fan4_div.dev_attr.attr,
+               &sensor_dev_attr_fan4_alarm.dev_attr.attr,
+               NULL
+       }, {
+               &sensor_dev_attr_fan5_input.dev_attr.attr,
+               &sensor_dev_attr_fan5_min.dev_attr.attr,
+               &sensor_dev_attr_fan5_div.dev_attr.attr,
+               &sensor_dev_attr_fan5_alarm.dev_attr.attr,
+               NULL
+       }, {
+               &sensor_dev_attr_fan6_input.dev_attr.attr,
+               &sensor_dev_attr_fan6_min.dev_attr.attr,
+               &sensor_dev_attr_fan6_div.dev_attr.attr,
+               &sensor_dev_attr_fan6_alarm.dev_attr.attr,
+               NULL
+       }, {
+               &sensor_dev_attr_fan7_input.dev_attr.attr,
+               &sensor_dev_attr_fan7_min.dev_attr.attr,
+               &sensor_dev_attr_fan7_div.dev_attr.attr,
+               &sensor_dev_attr_fan7_alarm.dev_attr.attr,
+               NULL
+       }
+};
 
+static const struct attribute_group w83792d_group_fan[4] = {
+       { .attrs = w83792d_attributes_fan[0] },
+       { .attrs = w83792d_attributes_fan[1] },
+       { .attrs = w83792d_attributes_fan[2] },
+       { .attrs = w83792d_attributes_fan[3] },
+};
+
+static struct attribute *w83792d_attributes[] = {
+       &sensor_dev_attr_in0_input.dev_attr.attr,
+       &sensor_dev_attr_in0_max.dev_attr.attr,
+       &sensor_dev_attr_in0_min.dev_attr.attr,
+       &sensor_dev_attr_in1_input.dev_attr.attr,
+       &sensor_dev_attr_in1_max.dev_attr.attr,
+       &sensor_dev_attr_in1_min.dev_attr.attr,
+       &sensor_dev_attr_in2_input.dev_attr.attr,
+       &sensor_dev_attr_in2_max.dev_attr.attr,
+       &sensor_dev_attr_in2_min.dev_attr.attr,
+       &sensor_dev_attr_in3_input.dev_attr.attr,
+       &sensor_dev_attr_in3_max.dev_attr.attr,
+       &sensor_dev_attr_in3_min.dev_attr.attr,
+       &sensor_dev_attr_in4_input.dev_attr.attr,
+       &sensor_dev_attr_in4_max.dev_attr.attr,
+       &sensor_dev_attr_in4_min.dev_attr.attr,
+       &sensor_dev_attr_in5_input.dev_attr.attr,
+       &sensor_dev_attr_in5_max.dev_attr.attr,
+       &sensor_dev_attr_in5_min.dev_attr.attr,
+       &sensor_dev_attr_in6_input.dev_attr.attr,
+       &sensor_dev_attr_in6_max.dev_attr.attr,
+       &sensor_dev_attr_in6_min.dev_attr.attr,
+       &sensor_dev_attr_in7_input.dev_attr.attr,
+       &sensor_dev_attr_in7_max.dev_attr.attr,
+       &sensor_dev_attr_in7_min.dev_attr.attr,
+       &sensor_dev_attr_in8_input.dev_attr.attr,
+       &sensor_dev_attr_in8_max.dev_attr.attr,
+       &sensor_dev_attr_in8_min.dev_attr.attr,
+       &sensor_dev_attr_in0_alarm.dev_attr.attr,
+       &sensor_dev_attr_in1_alarm.dev_attr.attr,
+       &sensor_dev_attr_in2_alarm.dev_attr.attr,
+       &sensor_dev_attr_in3_alarm.dev_attr.attr,
+       &sensor_dev_attr_in4_alarm.dev_attr.attr,
+       &sensor_dev_attr_in5_alarm.dev_attr.attr,
+       &sensor_dev_attr_in6_alarm.dev_attr.attr,
+       &sensor_dev_attr_in7_alarm.dev_attr.attr,
+       &sensor_dev_attr_in8_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp1_input.dev_attr.attr,
+       &sensor_dev_attr_temp1_max.dev_attr.attr,
+       &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
+       &sensor_dev_attr_temp2_input.dev_attr.attr,
+       &sensor_dev_attr_temp2_max.dev_attr.attr,
+       &sensor_dev_attr_temp2_max_hyst.dev_attr.attr,
+       &sensor_dev_attr_temp3_input.dev_attr.attr,
+       &sensor_dev_attr_temp3_max.dev_attr.attr,
+       &sensor_dev_attr_temp3_max_hyst.dev_attr.attr,
+       &sensor_dev_attr_temp1_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp2_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp3_alarm.dev_attr.attr,
+       &sensor_dev_attr_pwm1.dev_attr.attr,
+       &sensor_dev_attr_pwm1_mode.dev_attr.attr,
+       &sensor_dev_attr_pwm1_enable.dev_attr.attr,
+       &sensor_dev_attr_pwm2.dev_attr.attr,
+       &sensor_dev_attr_pwm2_mode.dev_attr.attr,
+       &sensor_dev_attr_pwm2_enable.dev_attr.attr,
+       &sensor_dev_attr_pwm3.dev_attr.attr,
+       &sensor_dev_attr_pwm3_mode.dev_attr.attr,
+       &sensor_dev_attr_pwm3_enable.dev_attr.attr,
+       &dev_attr_alarms.attr,
+       &dev_attr_chassis.attr,
+       &dev_attr_chassis_clear.attr,
+       &sensor_dev_attr_tolerance1.dev_attr.attr,
+       &sensor_dev_attr_thermal_cruise1.dev_attr.attr,
+       &sensor_dev_attr_tolerance2.dev_attr.attr,
+       &sensor_dev_attr_thermal_cruise2.dev_attr.attr,
+       &sensor_dev_attr_tolerance3.dev_attr.attr,
+       &sensor_dev_attr_thermal_cruise3.dev_attr.attr,
+       &sensor_dev_attr_sf2_point1_fan1.dev_attr.attr,
+       &sensor_dev_attr_sf2_point2_fan1.dev_attr.attr,
+       &sensor_dev_attr_sf2_point3_fan1.dev_attr.attr,
+       &sensor_dev_attr_sf2_point4_fan1.dev_attr.attr,
+       &sensor_dev_attr_sf2_point1_fan2.dev_attr.attr,
+       &sensor_dev_attr_sf2_point2_fan2.dev_attr.attr,
+       &sensor_dev_attr_sf2_point3_fan2.dev_attr.attr,
+       &sensor_dev_attr_sf2_point4_fan2.dev_attr.attr,
+       &sensor_dev_attr_sf2_point1_fan3.dev_attr.attr,
+       &sensor_dev_attr_sf2_point2_fan3.dev_attr.attr,
+       &sensor_dev_attr_sf2_point3_fan3.dev_attr.attr,
+       &sensor_dev_attr_sf2_point4_fan3.dev_attr.attr,
+       &sensor_dev_attr_sf2_level1_fan1.dev_attr.attr,
+       &sensor_dev_attr_sf2_level2_fan1.dev_attr.attr,
+       &sensor_dev_attr_sf2_level3_fan1.dev_attr.attr,
+       &sensor_dev_attr_sf2_level1_fan2.dev_attr.attr,
+       &sensor_dev_attr_sf2_level2_fan2.dev_attr.attr,
+       &sensor_dev_attr_sf2_level3_fan2.dev_attr.attr,
+       &sensor_dev_attr_sf2_level1_fan3.dev_attr.attr,
+       &sensor_dev_attr_sf2_level2_fan3.dev_attr.attr,
+       &sensor_dev_attr_sf2_level3_fan3.dev_attr.attr,
+       &sensor_dev_attr_fan1_input.dev_attr.attr,
+       &sensor_dev_attr_fan1_min.dev_attr.attr,
+       &sensor_dev_attr_fan1_div.dev_attr.attr,
+       &sensor_dev_attr_fan1_alarm.dev_attr.attr,
+       &sensor_dev_attr_fan2_input.dev_attr.attr,
+       &sensor_dev_attr_fan2_min.dev_attr.attr,
+       &sensor_dev_attr_fan2_div.dev_attr.attr,
+       &sensor_dev_attr_fan2_alarm.dev_attr.attr,
+       &sensor_dev_attr_fan3_input.dev_attr.attr,
+       &sensor_dev_attr_fan3_min.dev_attr.attr,
+       &sensor_dev_attr_fan3_div.dev_attr.attr,
+       &sensor_dev_attr_fan3_alarm.dev_attr.attr,
+       NULL
+};
+
+static const struct attribute_group w83792d_group = {
+       .attrs = w83792d_attributes,
+};
+
+/* Return 0 if detection is successful, -ENODEV otherwise */
 static int
-w83792d_detect(struct i2c_adapter *adapter, int address, int kind)
+w83792d_detect(struct i2c_client *client, struct i2c_board_info *info)
 {
-       int i = 0, val1 = 0, val2;
-       struct i2c_client *client;
-       struct device *dev;
-       struct w83792d_data *data;
-       int err = 0;
-       const char *client_name = "";
+       struct i2c_adapter *adapter = client->adapter;
+       int val1, val2;
+       unsigned short address = client->addr;
 
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
-               goto ERROR0;
+               return -ENODEV;
        }
 
-       /* 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 (w83792d_read_value(client, W83792D_REG_CONFIG) & 0x80)
+               return -ENODEV;
 
-       if (!(data = kzalloc(sizeof(struct w83792d_data), GFP_KERNEL))) {
-               err = -ENOMEM;
-               goto ERROR0;
-       }
-
-       client = &data->client;
-       dev = &client->dev;
-       i2c_set_clientdata(client, data);
-       client->addr = address;
-       client->adapter = adapter;
-       client->driver = &w83792d_driver;
-       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(client, W83792D_REG_CONFIG) & 0x80) {
-                       dev_dbg(dev, "Detection failed at step 1\n");
-                       goto ERROR1;
-               }
-               val1 = w83792d_read_value(client, W83792D_REG_BANK);
-               val2 = w83792d_read_value(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))) {
-                               dev_dbg(dev, "Detection failed at step 2\n");
-                               goto ERROR1;
-                       }
-               }
-               /* If Winbond chip, address of chip and W83792D_REG_I2C_ADDR
-                  should match */
-               if (w83792d_read_value(client,
-                                       W83792D_REG_I2C_ADDR) != address) {
-                       dev_dbg(dev, "Detection failed at step 3\n");
-                       goto ERROR1;
-               }
+       val1 = w83792d_read_value(client, W83792D_REG_BANK);
+       val2 = w83792d_read_value(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))
+                       return -ENODEV;
        }
+       /* If Winbond chip, address of chip and W83792D_REG_I2C_ADDR
+          should match */
+       if (w83792d_read_value(client, W83792D_REG_I2C_ADDR) != address)
+               return -ENODEV;
 
-       /* 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 */
+       /*  Put it now into bank 0 and Vendor ID High Byte */
        w83792d_write_value(client,
                            W83792D_REG_BANK,
                            (w83792d_read_value(client,
                                W83792D_REG_BANK) & 0x78) | 0x80);
 
        /* Determine the chip type. */
-       if (kind <= 0) {
-               /* get vendor ID */
-               val2 = w83792d_read_value(client, W83792D_REG_CHIPMAN);
-               if (val2 != 0x5c) {  /* the vendor is NOT Winbond */
-                       goto ERROR1;
-               }
-               val1 = w83792d_read_value(client, W83792D_REG_WCHIPID);
-               if (val1 == 0x7a) {
-                       kind = w83792d;
-               } else {
-                       if (kind == 0)
-                                       dev_warn(dev,
-                                       "w83792d: Ignoring 'force' parameter for"
-                                       " unknown chip at adapter %d, address"
-                                       " 0x%02x\n", i2c_adapter_id(adapter),
-                                       address);
-                       goto ERROR1;
-               }
-       }
+       val1 = w83792d_read_value(client, W83792D_REG_WCHIPID);
+       val2 = w83792d_read_value(client, W83792D_REG_CHIPMAN);
+       if (val1 != 0x7a || val2 != 0x5c)
+               return -ENODEV;
 
-       if (kind == w83792d) {
-               client_name = "w83792d";
-       } else {
-               dev_err(dev, "w83792d: Internal error: unknown"
-                                         " kind (%d)?!?", kind);
-               goto ERROR1;
-       }
+       strlcpy(info->type, "w83792d", I2C_NAME_SIZE);
+
+       return 0;
+}
+
+static int
+w83792d_probe(struct i2c_client *client, const struct i2c_device_id *id)
+{
+       struct w83792d_data *data;
+       struct device *dev = &client->dev;
+       int i, val1, err;
 
-       /* Fill in the remaining client fields and put into the global list */
-       strlcpy(client->name, client_name, I2C_NAME_SIZE);
-       data->type = kind;
+       data = kzalloc(sizeof(struct w83792d_data), GFP_KERNEL);
+       if (!data) {
+               err = -ENOMEM;
+               goto ERROR0;
+       }
 
+       i2c_set_clientdata(client, data);
        data->valid = 0;
        mutex_init(&data->update_lock);
 
-       /* Tell the I2C layer a new client has arrived */
-       if ((err = i2c_attach_client(client)))
+       err = w83792d_detect_subclients(client);
+       if (err)
                goto ERROR1;
 
-       if ((err = w83792d_detect_subclients(adapter, address,
-                       kind, client)))
-               goto ERROR2;
-
        /* Initialize the chip */
        w83792d_init_client(client);
 
@@ -1269,70 +1336,51 @@ w83792d_detect(struct i2c_adapter *adapter, int address, int kind)
        }
 
        /* Register sysfs hooks */
-       data->class_dev = hwmon_device_register(dev);
-       if (IS_ERR(data->class_dev)) {
-               err = PTR_ERR(data->class_dev);
+       if ((err = sysfs_create_group(&dev->kobj, &w83792d_group)))
                goto ERROR3;
-       }
-       for (i = 0; i < 9; i++) {
-               device_create_file(dev, &sda_in_input[i].dev_attr);
-               device_create_file(dev, &sda_in_max[i].dev_attr);
-               device_create_file(dev, &sda_in_min[i].dev_attr);
-       }
-       for (i = 0; i < 3; i++)
-               device_create_file_fan(dev, i);
 
        /* Read GPIO enable register to check if pins for fan 4,5 are used as
           GPIO */
        val1 = w83792d_read_value(client, W83792D_REG_GPIO_EN);
+
        if (!(val1 & 0x40))
-               device_create_file_fan(dev, 3);
+               if ((err = sysfs_create_group(&dev->kobj,
+                                             &w83792d_group_fan[0])))
+                       goto exit_remove_files;
+
        if (!(val1 & 0x20))
-               device_create_file_fan(dev, 4);
+               if ((err = sysfs_create_group(&dev->kobj,
+                                             &w83792d_group_fan[1])))
+                       goto exit_remove_files;
 
        val1 = w83792d_read_value(client, W83792D_REG_PIN);
        if (val1 & 0x40)
-               device_create_file_fan(dev, 5);
-       if (val1 & 0x04)
-               device_create_file_fan(dev, 6);
-
-       for (i = 0; i < 3; i++) {
-               device_create_file(dev, &sda_temp_input[i].dev_attr);
-               device_create_file(dev, &sda_temp_max[i].dev_attr);
-               device_create_file(dev, &sda_temp_max_hyst[i].dev_attr);
-               device_create_file(dev, &sda_thermal_cruise[i].dev_attr);
-               device_create_file(dev, &sda_tolerance[i].dev_attr);
-       }
+               if ((err = sysfs_create_group(&dev->kobj,
+                                             &w83792d_group_fan[2])))
+                       goto exit_remove_files;
 
-       for (i = 0; i < ARRAY_SIZE(sda_pwm); i++) {
-               device_create_file(dev, &sda_pwm[i].dev_attr);
-               device_create_file(dev, &sda_pwm_enable[i].dev_attr);
-               device_create_file(dev, &sda_pwm_mode[i].dev_attr);
+       if (val1 & 0x04)
+               if ((err = sysfs_create_group(&dev->kobj,
+                                             &w83792d_group_fan[3])))
+                       goto exit_remove_files;
+
+       data->hwmon_dev = hwmon_device_register(dev);
+       if (IS_ERR(data->hwmon_dev)) {
+               err = PTR_ERR(data->hwmon_dev);
+               goto exit_remove_files;
        }
 
-       device_create_file(dev, &dev_attr_alarms);
-       device_create_file(dev, &dev_attr_chassis);
-       device_create_file(dev, &dev_attr_chassis_clear);
-
-       for (i = 0; i < ARRAY_SIZE(sda_sf2_point); i++)
-               device_create_file(dev, &sda_sf2_point[i].dev_attr);
-
-       for (i = 0; i < ARRAY_SIZE(sda_sf2_level); i++)
-               device_create_file(dev, &sda_sf2_level[i].dev_attr);
-
        return 0;
 
+exit_remove_files:
+       sysfs_remove_group(&dev->kobj, &w83792d_group);
+       for (i = 0; i < ARRAY_SIZE(w83792d_group_fan); i++)
+               sysfs_remove_group(&dev->kobj, &w83792d_group_fan[i]);
 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(client);
+       if (data->lm75[0] != NULL)
+               i2c_unregister_device(data->lm75[0]);
+       if (data->lm75[1] != NULL)
+               i2c_unregister_device(data->lm75[1]);
 ERROR1:
        kfree(data);
 ERROR0:
@@ -1340,25 +1388,23 @@ ERROR0:
 }
 
 static int
-w83792d_detach_client(struct i2c_client *client)
+w83792d_remove(struct i2c_client *client)
 {
        struct w83792d_data *data = i2c_get_clientdata(client);
-       int err;
-
-       /* main client */
-       if (data)
-               hwmon_device_unregister(data->class_dev);
+       int i;
 
-       if ((err = i2c_detach_client(client)))
-               return err;
+       hwmon_device_unregister(data->hwmon_dev);
+       sysfs_remove_group(&client->dev.kobj, &w83792d_group);
+       for (i = 0; i < ARRAY_SIZE(w83792d_group_fan); i++)
+               sysfs_remove_group(&client->dev.kobj,
+                                  &w83792d_group_fan[i]);
 
-       /* main client */
-       if (data)
-               kfree(data);
-       /* subclient */
-       else
-               kfree(client);
+       if (data->lm75[0] != NULL)
+               i2c_unregister_device(data->lm75[0]);
+       if (data->lm75[1] != NULL)
+               i2c_unregister_device(data->lm75[1]);
 
+       kfree(data);
        return 0;
 }