vserver 1.9.5.x5

[linux-2.6.git] / drivers / i2c / chips / asb100.c

diff --git a/drivers/i2c/chips/asb100.c b/drivers/i2c/chips/asb100.c
index 355972c..7c6d896 100644 (file)
--- a/drivers/i2c/chips/asb100.c
+++ b/drivers/i2c/chips/asb100.c
@@ -56,15 +56,10 @@
 #define ASB100_VERSION "1.0.0"
 
 /* I2C addresses to scan */
-static unsigned short normal_i2c[] = { I2C_CLIENT_END };
-static unsigned short normal_i2c_range[] = { 0x28, 0x2f, I2C_CLIENT_END };
+static unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END };
 
 /* ISA addresses to scan (none) */
 static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
-static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END };
-
-/* default VRM to 9.0 instead of 8.2 */
-#define ASB100_DEFAULT_VRM 90
 
 /* Insmod parameters */
 SENSORS_INSMOD_1(asb100);
@@ -269,42 +264,42 @@ set_in_reg(MAX, max)
 static ssize_t \
        show_in##offset (struct device *dev, char *buf) \
 { \
-       return show_in(dev, buf, 0x##offset); \
+       return show_in(dev, buf, offset); \
 } \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO, \
-               show_in##offset, NULL) \
+               show_in##offset, NULL); \
 static ssize_t \
        show_in##offset##_min (struct device *dev, char *buf) \
 { \
-       return show_in_min(dev, buf, 0x##offset); \
+       return show_in_min(dev, buf, offset); \
 } \
 static ssize_t \
        show_in##offset##_max (struct device *dev, char *buf) \
 { \
-       return show_in_max(dev, buf, 0x##offset); \
+       return show_in_max(dev, buf, offset); \
 } \
 static ssize_t set_in##offset##_min (struct device *dev, \
                const char *buf, size_t count) \
 { \
-       return set_in_min(dev, buf, count, 0x##offset); \
+       return set_in_min(dev, buf, count, offset); \
 } \
 static ssize_t set_in##offset##_max (struct device *dev, \
                const char *buf, size_t count) \
 { \
-       return set_in_max(dev, buf, count, 0x##offset); \
+       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) \
+               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)
+               show_in##offset##_max, set_in##offset##_max);
 
-sysfs_in(0)
-sysfs_in(1)
-sysfs_in(2)
-sysfs_in(3)
-sysfs_in(4)
-sysfs_in(5)
-sysfs_in(6)
+sysfs_in(0);
+sysfs_in(1);
+sysfs_in(2);
+sysfs_in(3);
+sysfs_in(4);
+sysfs_in(5);
+sysfs_in(6);
 
 #define device_create_file_in(client, offset) do { \
        device_create_file(&client->dev, &dev_attr_in##offset##_input); \
@@ -410,15 +405,15 @@ static ssize_t set_fan##offset##_div(struct device *dev, const char *buf, \
        return set_fan_div(dev, buf, count, offset - 1); \
 } \
 static DEVICE_ATTR(fan##offset##_input, S_IRUGO, \
-               show_fan##offset, NULL) \
+               show_fan##offset, NULL); \
 static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR, \
-               show_fan##offset##_min, set_fan##offset##_min) \
+               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)
+               show_fan##offset##_div, set_fan##offset##_div);
 
-sysfs_fan(1)
-sysfs_fan(2)
-sysfs_fan(3)
+sysfs_fan(1);
+sysfs_fan(2);
+sysfs_fan(3);
 
 #define device_create_file_fan(client, offset) do { \
        device_create_file(&client->dev, &dev_attr_fan##offset##_input); \
@@ -449,9 +444,9 @@ static ssize_t show_##reg(struct device *dev, char *buf, int nr) \
        return sprintf_temp_from_reg(data->reg[nr], buf, nr); \
 }
 
-show_temp_reg(temp)
-show_temp_reg(temp_max)
-show_temp_reg(temp_hyst)
+show_temp_reg(temp);
+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, \
@@ -473,15 +468,15 @@ static ssize_t set_##reg(struct device *dev, const char *buf, \
        return count; \
 }
 
-set_temp_reg(MAX, temp_max)
-set_temp_reg(HYST, temp_hyst)
+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, char *buf) \
 { \
        return show_temp(dev, buf, num-1); \
 } \
-static DEVICE_ATTR(temp##num##_input, S_IRUGO, show_temp##num, NULL) \
+static DEVICE_ATTR(temp##num##_input, S_IRUGO, show_temp##num, NULL); \
 static ssize_t show_temp_max##num(struct device *dev, char *buf) \
 { \
        return show_temp_max(dev, buf, num-1); \
@@ -492,7 +487,7 @@ static ssize_t set_temp_max##num(struct device *dev, const char *buf, \
        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) \
+               show_temp_max##num, set_temp_max##num); \
 static ssize_t show_temp_hyst##num(struct device *dev, char *buf) \
 { \
        return show_temp_hyst(dev, buf, num-1); \
@@ -503,12 +498,12 @@ static ssize_t set_temp_hyst##num(struct device *dev, const char *buf, \
        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)
+               show_temp_hyst##num, set_temp_hyst##num);
 
-sysfs_temp(1)
-sysfs_temp(2)
-sysfs_temp(3)
-sysfs_temp(4)
+sysfs_temp(1);
+sysfs_temp(2);
+sysfs_temp(3);
+sysfs_temp(4);
 
 /* VID */
 #define device_create_file_temp(client, num) do { \
@@ -523,9 +518,9 @@ static ssize_t show_vid(struct device *dev, char *buf)
        return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm));
 }
 
-static DEVICE_ATTR(in0_ref, S_IRUGO, show_vid, NULL)
+static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
 #define device_create_file_vid(client) \
-device_create_file(&client->dev, &dev_attr_in0_ref)
+device_create_file(&client->dev, &dev_attr_cpu0_vid)
 
 /* VRM */
 static ssize_t show_vrm(struct device *dev, char *buf)
@@ -544,7 +539,7 @@ static ssize_t set_vrm(struct device *dev, const char *buf, size_t count)
 }
 
 /* Alarms */
-static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm)
+static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
 #define device_create_file_vrm(client) \
 device_create_file(&client->dev, &dev_attr_vrm);
 
@@ -554,7 +549,7 @@ static ssize_t show_alarms(struct device *dev, char *buf)
        return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->alarms));
 }
 
-static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL)
+static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 #define device_create_file_alarms(client) \
 device_create_file(&client->dev, &dev_attr_alarms)
 
@@ -594,12 +589,12 @@ static ssize_t set_pwm_enable1(struct device *dev, const char *buf,
        return count;
 }
 
-static DEVICE_ATTR(fan1_pwm, S_IRUGO | S_IWUSR, show_pwm1, set_pwm1)
-static DEVICE_ATTR(fan1_pwm_enable, S_IRUGO | S_IWUSR,
-               show_pwm_enable1, set_pwm_enable1)
+static DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, show_pwm1, set_pwm1);
+static DEVICE_ATTR(pwm1_enable, S_IRUGO | S_IWUSR,
+               show_pwm_enable1, set_pwm_enable1);
 #define device_create_file_pwm1(client) do { \
-       device_create_file(&new_client->dev, &dev_attr_fan1_pwm); \
-       device_create_file(&new_client->dev, &dev_attr_fan1_pwm_enable); \
+       device_create_file(&new_client->dev, &dev_attr_pwm1); \
+       device_create_file(&new_client->dev, &dev_attr_pwm1_enable); \
 } while (0)
 
 /* This function is called when:
@@ -609,7 +604,7 @@ static DEVICE_ATTR(fan1_pwm_enable, S_IRUGO | S_IWUSR,
  */
 static int asb100_attach_adapter(struct i2c_adapter *adapter)
 {
-       if (!(adapter->class & I2C_ADAP_CLASS_SMBUS))
+       if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
        return i2c_detect(adapter, &addr_data, asb100_detect);
 }
@@ -855,7 +850,13 @@ static int asb100_detach_client(struct i2c_client *client)
                return err;
        }
 
-       kfree(i2c_get_clientdata(client));
+       if (i2c_get_clientdata(client)==NULL) {
+               /* subclients */
+               kfree(client);
+       } else {
+               /* main client */
+               kfree(i2c_get_clientdata(client));
+       }
 
        return 0;
 }
@@ -953,7 +954,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 = ASB100_DEFAULT_VRM;
+       data->vrm = i2c_which_vrm();
        vid = vid_from_reg(vid, data->vrm);
 
        /* Start monitoring */