1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c
index 57b1c7b7ac3f..9460dba4cf74 100644
--- a/drivers/hwmon/asb100.c
+++ b/drivers/hwmon/asb100.c
@@ -143,7 +143,7 @@ static int FAN_FROM_REG(u8 val, int div)
 
 /* TEMP: 0.001C/bit (-128C to +127C)
    REG: 1C/bit, two's complement */
-static u8 TEMP_TO_REG(int temp)
+static u8 TEMP_TO_REG(long temp)
 {
         int ntemp = SENSORS_LIMIT(temp, ASB100_TEMP_MIN, ASB100_TEMP_MAX);
         ntemp += (ntemp<0 ? -500 : 500);
@@ -182,7 +182,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 device *hwmon_dev;
         struct mutex lock;
         enum chips type;
 
@@ -448,7 +448,7 @@ static ssize_t set_##reg(struct device *dev, const char *buf, \
 { \
         struct i2c_client *client = to_i2c_client(dev); \
         struct asb100_data *data = i2c_get_clientdata(client); \
-        unsigned long val = simple_strtoul(buf, NULL, 10); \
+        long val = simple_strtol(buf, NULL, 10); \
  \
         mutex_lock(&data->update_lock); \
         switch (nr) { \
@@ -514,7 +514,7 @@ 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)
 {
-        struct asb100_data *data = asb100_update_device(dev);
+        struct asb100_data *data = dev_get_drvdata(dev);
         return sprintf(buf, "%d\n", data->vrm);
 }
 
@@ -844,9 +844,9 @@ static int asb100_detect(struct i2c_adapter *adapter, int address, int kind)
         if ((err = sysfs_create_group(&new_client->dev.kobj, &asb100_group)))
                 goto ERROR3;
 
-        data->class_dev = hwmon_device_register(&new_client->dev);
-        if (IS_ERR(data->class_dev)) {
-                err = PTR_ERR(data->class_dev);
+        data->hwmon_dev = hwmon_device_register(&new_client->dev);
+        if (IS_ERR(data->hwmon_dev)) {
+                err = PTR_ERR(data->hwmon_dev);
                 goto ERROR4;
         }
 
@@ -874,7 +874,7 @@ static int asb100_detach_client(struct i2c_client *client)
 
         /* main client */
         if (data) {
-                hwmon_device_unregister(data->class_dev);
+                hwmon_device_unregister(data->hwmon_dev);
                 sysfs_remove_group(&client->dev.kobj, &asb100_group);
         }