1 files changed, 183 insertions, 212 deletions

diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 9460dba4cf74..950cea8d1d65 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -40,6 +40,7 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
 #include <linux/hwmon-vid.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -47,12 +48,6 @@
 #include <linux/mutex.h>
 #include "lm75.h"
 
-/*
-        HISTORY:
-        2003-12-29      1.0.0   Ported from lm_sensors project for kernel 2.6
-*/
-#define ASB100_VERSION "1.0.0"
-
 /* I2C addresses to scan */
 static unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END };
 
@@ -221,15 +216,16 @@ static struct i2c_driver asb100_driver = {
         .driver = {
                 .name   = "asb100",
         },
-        .id             = I2C_DRIVERID_ASB100,
         .attach_adapter = asb100_attach_adapter,
         .detach_client  = asb100_detach_client,
 };
 
 /* 7 Voltages */
 #define show_in_reg(reg) \
-static ssize_t show_##reg (struct device *dev, char *buf, int nr) \
+static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
+                char *buf) \
 { \
+        int nr = to_sensor_dev_attr(attr)->index; \
         struct asb100_data *data = asb100_update_device(dev); \
         return sprintf(buf, "%d\n", IN_FROM_REG(data->reg[nr])); \
 }
@@ -239,9 +235,10 @@ show_in_reg(in_min)
 show_in_reg(in_max)
 
 #define set_in_reg(REG, reg) \
-static ssize_t set_in_##reg(struct device *dev, const char *buf, \
-                size_t count, int nr) \
+static ssize_t set_in_##reg(struct device *dev, struct device_attribute *attr, \
+                const char *buf, size_t count) \
 { \
+        int nr = to_sensor_dev_attr(attr)->index; \
         struct i2c_client *client = to_i2c_client(dev); \
         struct asb100_data *data = i2c_get_clientdata(client); \
         unsigned long val = simple_strtoul(buf, NULL, 10); \
@@ -258,37 +255,12 @@ set_in_reg(MIN, min)
 set_in_reg(MAX, max)
 
 #define sysfs_in(offset) \
-static ssize_t \
-        show_in##offset (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_in(dev, buf, offset); \
-} \
-static DEVICE_ATTR(in##offset##_input, S_IRUGO, \
-                show_in##offset, NULL); \
-static ssize_t \
-        show_in##offset##_min (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_in_min(dev, buf, offset); \
-} \
-static ssize_t \
-        show_in##offset##_max (struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_in_max(dev, buf, offset); \
-} \
-static ssize_t set_in##offset##_min (struct device *dev, struct device_attribute *attr, \
-                const char *buf, size_t count) \
-{ \
-        return set_in_min(dev, buf, count, offset); \
-} \
-static ssize_t set_in##offset##_max (struct device *dev, struct device_attribute *attr, \
-                const char *buf, size_t count) \
-{ \
-        return set_in_max(dev, buf, count, offset); \
-} \
-static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR, \
-                show_in##offset##_min, set_in##offset##_min); \
-static DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \
-                show_in##offset##_max, set_in##offset##_max);
+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, set_in_min, offset); \
+static SENSOR_DEVICE_ATTR(in##offset##_max, S_IRUGO | S_IWUSR, \
+                show_in_max, set_in_max, offset)
 
 sysfs_in(0);
 sysfs_in(1);
@@ -299,29 +271,36 @@ sysfs_in(5);
 sysfs_in(6);
 
 /* 3 Fans */
-static ssize_t show_fan(struct device *dev, char *buf, int nr)
+static ssize_t show_fan(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        int nr = to_sensor_dev_attr(attr)->index;
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[nr],
                 DIV_FROM_REG(data->fan_div[nr])));
 }
 
-static ssize_t show_fan_min(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_min(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        int nr = to_sensor_dev_attr(attr)->index;
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan_min[nr],
                 DIV_FROM_REG(data->fan_div[nr])));
 }
 
-static ssize_t show_fan_div(struct device *dev, char *buf, int nr)
+static ssize_t show_fan_div(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
+        int nr = to_sensor_dev_attr(attr)->index;
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[nr]));
 }
 
-static ssize_t set_fan_min(struct device *dev, const char *buf,
-                                size_t count, int nr)
+static ssize_t set_fan_min(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        int nr = to_sensor_dev_attr(attr)->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct asb100_data *data = i2c_get_clientdata(client);
         u32 val = simple_strtoul(buf, NULL, 10);
@@ -337,22 +316,23 @@ static ssize_t set_fan_min(struct device *dev, const char *buf,
    determined in part by the fan divisor.  This follows the principle of
    least surprise; the user doesn't expect the fan minimum to change just
    because the divisor changed. */
-static ssize_t set_fan_div(struct device *dev, const char *buf,
-                                size_t count, int nr)
+static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
+        int nr = to_sensor_dev_attr(attr)->index;
         struct i2c_client *client = to_i2c_client(dev);
         struct asb100_data *data = i2c_get_clientdata(client);
         unsigned long min;
         unsigned long val = simple_strtoul(buf, NULL, 10);
         int reg;
-        
+
         mutex_lock(&data->update_lock);
 
         min = FAN_FROM_REG(data->fan_min[nr],
                         DIV_FROM_REG(data->fan_div[nr]));
         data->fan_div[nr] = DIV_TO_REG(val);
 
-        switch(nr) {
+        switch (nr) {
         case 0: /* fan 1 */
                 reg = asb100_read_value(client, ASB100_REG_VID_FANDIV);
                 reg = (reg & 0xcf) | (data->fan_div[0] << 4);
@@ -382,34 +362,12 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 }
 
 #define sysfs_fan(offset) \
-static ssize_t show_fan##offset(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_fan(dev, buf, offset - 1); \
-} \
-static ssize_t show_fan##offset##_min(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_fan_min(dev, buf, offset - 1); \
-} \
-static ssize_t show_fan##offset##_div(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_fan_div(dev, buf, 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 ssize_t set_fan##offset##_div(struct device *dev, struct device_attribute *attr, const char *buf, \
-                                        size_t count) \
-{ \
-        return set_fan_div(dev, buf, count, offset - 1); \
-} \
-static DEVICE_ATTR(fan##offset##_input, S_IRUGO, \
-                show_fan##offset, NULL); \
-static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
-                show_fan##offset##_min, set_fan##offset##_min); \
-static DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
-                show_fan##offset##_div, set_fan##offset##_div);
+static SENSOR_DEVICE_ATTR(fan##offset##_input, S_IRUGO, \
+                show_fan, NULL, offset - 1); \
+static SENSOR_DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
+                show_fan_min, set_fan_min, offset - 1); \
+static SENSOR_DEVICE_ATTR(fan##offset##_div, S_IRUGO | S_IWUSR, \
+                show_fan_div, set_fan_div, offset - 1)
 
 sysfs_fan(1);
 sysfs_fan(2);
@@ -430,10 +388,12 @@ static int sprintf_temp_from_reg(u16 reg, char *buf, int nr)
         }
         return ret;
 }
-                        
+
 #define show_temp_reg(reg) \
-static ssize_t show_##reg(struct device *dev, char *buf, int nr) \
+static ssize_t show_##reg(struct device *dev, struct device_attribute *attr, \
+                char *buf) \
 { \
+        int nr = to_sensor_dev_attr(attr)->index; \
         struct asb100_data *data = asb100_update_device(dev); \
         return sprintf_temp_from_reg(data->reg[nr], buf, nr); \
 }
@@ -443,9 +403,10 @@ show_temp_reg(temp_max);
 show_temp_reg(temp_hyst);
 
 #define set_temp_reg(REG, reg) \
-static ssize_t set_##reg(struct device *dev, const char *buf, \
-                        size_t count, int nr) \
+static ssize_t set_##reg(struct device *dev, struct device_attribute *attr, \
+                const char *buf, size_t count) \
 { \
+        int nr = to_sensor_dev_attr(attr)->index; \
         struct i2c_client *client = to_i2c_client(dev); \
         struct asb100_data *data = i2c_get_clientdata(client); \
         long val = simple_strtol(buf, NULL, 10); \
@@ -469,33 +430,12 @@ set_temp_reg(MAX, temp_max);
 set_temp_reg(HYST, temp_hyst);
 
 #define sysfs_temp(num) \
-static ssize_t show_temp##num(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_temp(dev, buf, num-1); \
-} \
-static DEVICE_ATTR(temp##num##_input, S_IRUGO, show_temp##num, NULL); \
-static ssize_t show_temp_max##num(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_temp_max(dev, buf, num-1); \
-} \
-static ssize_t set_temp_max##num(struct device *dev, struct device_attribute *attr, const char *buf, \
-                                        size_t count) \
-{ \
-        return set_temp_max(dev, buf, count, num-1); \
-} \
-static DEVICE_ATTR(temp##num##_max, S_IRUGO | S_IWUSR, \
-                show_temp_max##num, set_temp_max##num); \
-static ssize_t show_temp_hyst##num(struct device *dev, struct device_attribute *attr, char *buf) \
-{ \
-        return show_temp_hyst(dev, buf, num-1); \
-} \
-static ssize_t set_temp_hyst##num(struct device *dev, struct device_attribute *attr, const char *buf, \
-                                        size_t count) \
-{ \
-        return set_temp_hyst(dev, buf, count, num-1); \
-} \
-static DEVICE_ATTR(temp##num##_max_hyst, S_IRUGO | S_IWUSR, \
-                show_temp_hyst##num, set_temp_hyst##num);
+static SENSOR_DEVICE_ATTR(temp##num##_input, S_IRUGO, \
+                show_temp, NULL, num - 1); \
+static SENSOR_DEVICE_ATTR(temp##num##_max, S_IRUGO | S_IWUSR, \
+                show_temp_max, set_temp_max, num - 1); \
+static SENSOR_DEVICE_ATTR(temp##num##_max_hyst, S_IRUGO | S_IWUSR, \
+                show_temp_hyst, set_temp_hyst, num - 1)
 
 sysfs_temp(1);
 sysfs_temp(2);
@@ -503,7 +443,8 @@ sysfs_temp(3);
 sysfs_temp(4);
 
 /* VID */
-static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_vid(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
@@ -512,25 +453,26 @@ static ssize_t show_vid(struct device *dev, struct device_attribute *attr, char
 static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 
 /* VRM */
-static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_vrm(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
         struct asb100_data *data = dev_get_drvdata(dev);
         return sprintf(buf, "%d\n", data->vrm);
 }
 
-static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t set_vrm(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
-        struct asb100_data *data = i2c_get_clientdata(client);
-        unsigned long val = simple_strtoul(buf, NULL, 10);
-        data->vrm = val;
+        struct asb100_data *data = dev_get_drvdata(dev);
+        data->vrm = simple_strtoul(buf, NULL, 10);
         return count;
 }
 
 /* Alarms */
 static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
 
-static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_alarms(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%u\n", data->alarms);
@@ -538,14 +480,35 @@ static ssize_t show_alarms(struct device *dev, struct device_attribute *attr, ch
 
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
+static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        int bitnr = to_sensor_dev_attr(attr)->index;
+        struct asb100_data *data = asb100_update_device(dev);
+        return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
+}
+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(in2_alarm, S_IRUGO, show_alarm, NULL, 2);
+static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);
+static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);
+static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);
+static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);
+static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 11);
+static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);
+static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 5);
+static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 13);
+
 /* 1 PWM */
-static ssize_t show_pwm1(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_pwm1(struct device *dev, struct device_attribute *attr,
+                char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", ASB100_PWM_FROM_REG(data->pwm & 0x0f));
 }
 
-static ssize_t set_pwm1(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t set_pwm1(struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct asb100_data *data = i2c_get_clientdata(client);
@@ -559,14 +522,15 @@ static ssize_t set_pwm1(struct device *dev, struct device_attribute *attr, const
         return count;
 }
 
-static ssize_t show_pwm_enable1(struct device *dev, struct device_attribute *attr, char *buf)
+static ssize_t show_pwm_enable1(struct device *dev,
+                struct device_attribute *attr, char *buf)
 {
         struct asb100_data *data = asb100_update_device(dev);
         return sprintf(buf, "%d\n", (data->pwm & 0x80) ? 1 : 0);
 }
 
-static ssize_t set_pwm_enable1(struct device *dev, struct device_attribute *attr, const char *buf,
-                                size_t count)
+static ssize_t set_pwm_enable1(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
 {
         struct i2c_client *client = to_i2c_client(dev);
         struct asb100_data *data = i2c_get_clientdata(client);
@@ -585,50 +549,62 @@ static DEVICE_ATTR(pwm1_enable, S_IRUGO | S_IWUSR,
                 show_pwm_enable1, set_pwm_enable1);
 
 static struct attribute *asb100_attributes[] = {
-        &dev_attr_in0_input.attr,
-        &dev_attr_in0_min.attr,
-        &dev_attr_in0_max.attr,
-        &dev_attr_in1_input.attr,
-        &dev_attr_in1_min.attr,
-        &dev_attr_in1_max.attr,
-        &dev_attr_in2_input.attr,
-        &dev_attr_in2_min.attr,
-        &dev_attr_in2_max.attr,
-        &dev_attr_in3_input.attr,
-        &dev_attr_in3_min.attr,
-        &dev_attr_in3_max.attr,
-        &dev_attr_in4_input.attr,
-        &dev_attr_in4_min.attr,
-        &dev_attr_in4_max.attr,
-        &dev_attr_in5_input.attr,
-        &dev_attr_in5_min.attr,
-        &dev_attr_in5_max.attr,
-        &dev_attr_in6_input.attr,
-        &dev_attr_in6_min.attr,
-        &dev_attr_in6_max.attr,
-
-        &dev_attr_fan1_input.attr,
-        &dev_attr_fan1_min.attr,
-        &dev_attr_fan1_div.attr,
-        &dev_attr_fan2_input.attr,
-        &dev_attr_fan2_min.attr,
-        &dev_attr_fan2_div.attr,
-        &dev_attr_fan3_input.attr,
-        &dev_attr_fan3_min.attr,
-        &dev_attr_fan3_div.attr,
-
-        &dev_attr_temp1_input.attr,
-        &dev_attr_temp1_max.attr,
-        &dev_attr_temp1_max_hyst.attr,
-        &dev_attr_temp2_input.attr,
-        &dev_attr_temp2_max.attr,
-        &dev_attr_temp2_max_hyst.attr,
-        &dev_attr_temp3_input.attr,
-        &dev_attr_temp3_max.attr,
-        &dev_attr_temp3_max_hyst.attr,
-        &dev_attr_temp4_input.attr,
-        &dev_attr_temp4_max.attr,
-        &dev_attr_temp4_max_hyst.attr,
+        &sensor_dev_attr_in0_input.dev_attr.attr,
+        &sensor_dev_attr_in0_min.dev_attr.attr,
+        &sensor_dev_attr_in0_max.dev_attr.attr,
+        &sensor_dev_attr_in1_input.dev_attr.attr,
+        &sensor_dev_attr_in1_min.dev_attr.attr,
+        &sensor_dev_attr_in1_max.dev_attr.attr,
+        &sensor_dev_attr_in2_input.dev_attr.attr,
+        &sensor_dev_attr_in2_min.dev_attr.attr,
+        &sensor_dev_attr_in2_max.dev_attr.attr,
+        &sensor_dev_attr_in3_input.dev_attr.attr,
+        &sensor_dev_attr_in3_min.dev_attr.attr,
+        &sensor_dev_attr_in3_max.dev_attr.attr,
+        &sensor_dev_attr_in4_input.dev_attr.attr,
+        &sensor_dev_attr_in4_min.dev_attr.attr,
+        &sensor_dev_attr_in4_max.dev_attr.attr,
+        &sensor_dev_attr_in5_input.dev_attr.attr,
+        &sensor_dev_attr_in5_min.dev_attr.attr,
+        &sensor_dev_attr_in5_max.dev_attr.attr,
+        &sensor_dev_attr_in6_input.dev_attr.attr,
+        &sensor_dev_attr_in6_min.dev_attr.attr,
+        &sensor_dev_attr_in6_max.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_fan2_input.dev_attr.attr,
+        &sensor_dev_attr_fan2_min.dev_attr.attr,
+        &sensor_dev_attr_fan2_div.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_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_temp4_input.dev_attr.attr,
+        &sensor_dev_attr_temp4_max.dev_attr.attr,
+        &sensor_dev_attr_temp4_max_hyst.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_fan1_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan2_alarm.dev_attr.attr,
+        &sensor_dev_attr_fan3_alarm.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,
 
         &dev_attr_cpu0_vid.attr,
         &dev_attr_vrm.attr,
@@ -656,10 +632,10 @@ static int asb100_attach_adapter(struct i2c_adapter *adapter)
 }
 
 static int asb100_detect_subclients(struct i2c_adapter *adapter, int address,
-                int kind, struct i2c_client *new_client)
+                int kind, struct i2c_client *client)
 {
         int i, id, err;
-        struct asb100_data *data = i2c_get_clientdata(new_client);
+        struct asb100_data *data = i2c_get_clientdata(client);
 
         data->lm75[0] = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
         if (!(data->lm75[0])) {
@@ -679,26 +655,26 @@ static int asb100_detect_subclients(struct i2c_adapter *adapter, int address,
                 for (i = 2; i <= 3; i++) {
                         if (force_subclients[i] < 0x48 ||
                             force_subclients[i] > 0x4f) {
-                                dev_err(&new_client->dev, "invalid subclient "
+                                dev_err(&client->dev, "invalid subclient "
                                         "address %d; must be 0x48-0x4f\n",
                                         force_subclients[i]);
                                 err = -ENODEV;
                                 goto ERROR_SC_2;
                         }
                 }
-                asb100_write_value(new_client, ASB100_REG_I2C_SUBADDR,
+                asb100_write_value(client, ASB100_REG_I2C_SUBADDR,
                                         (force_subclients[2] & 0x07) |
-                                        ((force_subclients[3] & 0x07) <<4));
+                                        ((force_subclients[3] & 0x07) << 4));
                 data->lm75[0]->addr = force_subclients[2];
                 data->lm75[1]->addr = force_subclients[3];
         } else {
-                int val = asb100_read_value(new_client, ASB100_REG_I2C_SUBADDR);
+                int val = asb100_read_value(client, ASB100_REG_I2C_SUBADDR);
                 data->lm75[0]->addr = 0x48 + (val & 0x07);
                 data->lm75[1]->addr = 0x48 + ((val >> 4) & 0x07);
         }
 
-        if(data->lm75[0]->addr == data->lm75[1]->addr) {
-                dev_err(&new_client->dev, "duplicate addresses 0x%x "
+        if (data->lm75[0]->addr == data->lm75[1]->addr) {
+                dev_err(&client->dev, "duplicate addresses 0x%x "
                                 "for subclients\n", data->lm75[0]->addr);
                 err = -ENODEV;
                 goto ERROR_SC_2;
@@ -708,18 +684,17 @@ static int asb100_detect_subclients(struct i2c_adapter *adapter, int address,
                 i2c_set_clientdata(data->lm75[i], NULL);
                 data->lm75[i]->adapter = adapter;
                 data->lm75[i]->driver = &asb100_driver;
-                data->lm75[i]->flags = 0;
                 strlcpy(data->lm75[i]->name, "asb100 subclient", I2C_NAME_SIZE);
         }
 
         if ((err = i2c_attach_client(data->lm75[0]))) {
-                dev_err(&new_client->dev, "subclient %d registration "
+                dev_err(&client->dev, "subclient %d registration "
                         "at address 0x%x failed.\n", i, data->lm75[0]->addr);
                 goto ERROR_SC_2;
         }
 
         if ((err = i2c_attach_client(data->lm75[1]))) {
-                dev_err(&new_client->dev, "subclient %d registration "
+                dev_err(&client->dev, "subclient %d registration "
                         "at address 0x%x failed.\n", i, data->lm75[1]->addr);
                 goto ERROR_SC_3;
         }
@@ -740,7 +715,7 @@ ERROR_SC_0:
 static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
 {
         int err;
-        struct i2c_client *new_client;
+        struct i2c_client *client;
         struct asb100_data *data;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
@@ -760,13 +735,12 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
                 goto ERROR0;
         }
 
-        new_client = &data->client;
+        client = &data->client;
         mutex_init(&data->lock);
-        i2c_set_clientdata(new_client, data);
-        new_client->addr = address;
-        new_client->adapter = adapter;
-        new_client->driver = &asb100_driver;
-        new_client->flags = 0;
+        i2c_set_clientdata(client, data);
+        client->addr = address;
+        client->adapter = adapter;
+        client->driver = &asb100_driver;
 
         /* Now, we do the remaining detection. */
 
@@ -776,15 +750,15 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
            bank. */
         if (kind < 0) {
 
-                int val1 = asb100_read_value(new_client, ASB100_REG_BANK);
-                int val2 = asb100_read_value(new_client, ASB100_REG_CHIPMAN);
+                int val1 = asb100_read_value(client, ASB100_REG_BANK);
+                int val2 = asb100_read_value(client, ASB100_REG_CHIPMAN);
 
                 /* If we're in bank 0 */
-                if ( (!(val1 & 0x07)) &&
+                if ((!(val1 & 0x07)) &&
                                 /* Check for ASB100 ID (low byte) */
-                                ( ((!(val1 & 0x80)) && (val2 != 0x94)) ||
+                                (((!(val1 & 0x80)) && (val2 != 0x94)) ||
                                 /* Check for ASB100 ID (high byte ) */
-                                ((val1 & 0x80) && (val2 != 0x06)) ) ) {
+                                ((val1 & 0x80) && (val2 != 0x06)))) {
                         pr_debug("asb100.o: detect failed, "
                                         "bad chip id 0x%02x!\n", val2);
                         err = -ENODEV;
@@ -795,19 +769,19 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* We have either had a force parameter, or we have already detected
            Winbond. Put it now into bank 0 and Vendor ID High Byte */
-        asb100_write_value(new_client, ASB100_REG_BANK,
-                (asb100_read_value(new_client, ASB100_REG_BANK) & 0x78) | 0x80);
+        asb100_write_value(client, ASB100_REG_BANK,
+                (asb100_read_value(client, ASB100_REG_BANK) & 0x78) | 0x80);
 
         /* Determine the chip type. */
         if (kind <= 0) {
-                int val1 = asb100_read_value(new_client, ASB100_REG_WCHIPID);
-                int val2 = asb100_read_value(new_client, ASB100_REG_CHIPMAN);
+                int val1 = asb100_read_value(client, ASB100_REG_WCHIPID);
+                int val2 = asb100_read_value(client, ASB100_REG_CHIPMAN);
 
                 if ((val1 == 0x31) && (val2 == 0x06))
                         kind = asb100;
                 else {
                         if (kind == 0)
-                                dev_warn(&new_client->dev, "ignoring "
+                                dev_warn(&client->dev, "ignoring "
                                         "'force' parameter for unknown chip "
                                         "at adapter %d, address 0x%02x.\n",
                                         i2c_adapter_id(adapter), address);
@@ -817,34 +791,32 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* Fill in remaining client fields and put it into the global list */
-        strlcpy(new_client->name, "asb100", I2C_NAME_SIZE);
+        strlcpy(client->name, "asb100", I2C_NAME_SIZE);
         data->type = kind;
-
-        data->valid = 0;
         mutex_init(&data->update_lock);
 
         /* Tell the I2C layer a new client has arrived */
-        if ((err = i2c_attach_client(new_client)))
+        if ((err = i2c_attach_client(client)))
                 goto ERROR1;
 
         /* Attach secondary lm75 clients */
         if ((err = asb100_detect_subclients(adapter, address, kind,
-                        new_client)))
+                        client)))
                 goto ERROR2;
 
         /* Initialize the chip */
-        asb100_init_client(new_client);
+        asb100_init_client(client);
 
         /* A few vars need to be filled upon startup */
-        data->fan_min[0] = asb100_read_value(new_client, ASB100_REG_FAN_MIN(0));
-        data->fan_min[1] = asb100_read_value(new_client, ASB100_REG_FAN_MIN(1));
-        data->fan_min[2] = asb100_read_value(new_client, ASB100_REG_FAN_MIN(2));
+        data->fan_min[0] = asb100_read_value(client, ASB100_REG_FAN_MIN(0));
+        data->fan_min[1] = asb100_read_value(client, ASB100_REG_FAN_MIN(1));
+        data->fan_min[2] = asb100_read_value(client, ASB100_REG_FAN_MIN(2));
 
         /* Register sysfs hooks */
-        if ((err = sysfs_create_group(&new_client->dev.kobj, &asb100_group)))
+        if ((err = sysfs_create_group(&client->dev.kobj, &asb100_group)))
                 goto ERROR3;
 
-        data->hwmon_dev = hwmon_device_register(&new_client->dev);
+        data->hwmon_dev = hwmon_device_register(&client->dev);
         if (IS_ERR(data->hwmon_dev)) {
                 err = PTR_ERR(data->hwmon_dev);
                 goto ERROR4;
@@ -853,14 +825,14 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
         return 0;
 
 ERROR4:
-        sysfs_remove_group(&new_client->dev.kobj, &asb100_group);
+        sysfs_remove_group(&client->dev.kobj, &asb100_group);
 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);
+        i2c_detach_client(client);
 ERROR1:
         kfree(data);
 ERROR0:
@@ -916,17 +888,17 @@ static int asb100_read_value(struct i2c_client *client, u16 reg)
                 /* convert from ISA to LM75 I2C addresses */
                 switch (reg & 0xff) {
                 case 0x50: /* TEMP */
-                        res = swab16(i2c_smbus_read_word_data (cl, 0));
+                        res = swab16(i2c_smbus_read_word_data(cl, 0));
                         break;
                 case 0x52: /* CONFIG */
                         res = i2c_smbus_read_byte_data(cl, 1);
                         break;
                 case 0x53: /* HYST */
-                        res = swab16(i2c_smbus_read_word_data (cl, 2));
+                        res = swab16(i2c_smbus_read_word_data(cl, 2));
                         break;
                 case 0x55: /* MAX */
                 default:
-                        res = swab16(i2c_smbus_read_word_data (cl, 3));
+                        res = swab16(i2c_smbus_read_word_data(cl, 3));
                         break;
                 }
         }
@@ -989,7 +961,7 @@ static void asb100_init_client(struct i2c_client *client)
         vid = vid_from_reg(vid, data->vrm);
 
         /* Start monitoring */
-        asb100_write_value(client, ASB100_REG_CONFIG, 
+        asb100_write_value(client, ASB100_REG_CONFIG,
                 (asb100_read_value(client, ASB100_REG_CONFIG) & 0xf7) | 0x01);
 }
 
@@ -1078,4 +1050,3 @@ MODULE_LICENSE("GPL");
 
 module_init(asb100_init);
 module_exit(asb100_exit);
-