diff options
Diffstat (limited to 'drivers/hwmon/adm1025.c')
-rw-r--r-- | drivers/hwmon/adm1025.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hwmon/adm1025.c b/drivers/hwmon/adm1025.c index 8c562885b54b..041ecb0bdf48 100644 --- a/drivers/hwmon/adm1025.c +++ b/drivers/hwmon/adm1025.c | |||
@@ -133,7 +133,7 @@ static struct i2c_driver adm1025_driver = { | |||
133 | 133 | ||
134 | struct adm1025_data { | 134 | struct adm1025_data { |
135 | struct i2c_client client; | 135 | struct i2c_client client; |
136 | struct class_device *class_dev; | 136 | struct device *hwmon_dev; |
137 | struct mutex update_lock; | 137 | struct mutex update_lock; |
138 | char valid; /* zero until following fields are valid */ | 138 | char valid; /* zero until following fields are valid */ |
139 | unsigned long last_updated; /* in jiffies */ | 139 | unsigned long last_updated; /* in jiffies */ |
@@ -292,7 +292,7 @@ static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL); | |||
292 | 292 | ||
293 | static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf) | 293 | static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf) |
294 | { | 294 | { |
295 | struct adm1025_data *data = adm1025_update_device(dev); | 295 | struct adm1025_data *data = dev_get_drvdata(dev); |
296 | return sprintf(buf, "%u\n", data->vrm); | 296 | return sprintf(buf, "%u\n", data->vrm); |
297 | } | 297 | } |
298 | static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) | 298 | static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
@@ -472,9 +472,9 @@ static int adm1025_detect(struct i2c_adapter *adapter, int address, int kind) | |||
472 | goto exit_remove; | 472 | goto exit_remove; |
473 | } | 473 | } |
474 | 474 | ||
475 | data->class_dev = hwmon_device_register(&new_client->dev); | 475 | data->hwmon_dev = hwmon_device_register(&new_client->dev); |
476 | if (IS_ERR(data->class_dev)) { | 476 | if (IS_ERR(data->hwmon_dev)) { |
477 | err = PTR_ERR(data->class_dev); | 477 | err = PTR_ERR(data->hwmon_dev); |
478 | goto exit_remove; | 478 | goto exit_remove; |
479 | } | 479 | } |
480 | 480 | ||
@@ -538,7 +538,7 @@ static int adm1025_detach_client(struct i2c_client *client) | |||
538 | struct adm1025_data *data = i2c_get_clientdata(client); | 538 | struct adm1025_data *data = i2c_get_clientdata(client); |
539 | int err; | 539 | int err; |
540 | 540 | ||
541 | hwmon_device_unregister(data->class_dev); | 541 | hwmon_device_unregister(data->hwmon_dev); |
542 | sysfs_remove_group(&client->dev.kobj, &adm1025_group); | 542 | sysfs_remove_group(&client->dev.kobj, &adm1025_group); |
543 | sysfs_remove_group(&client->dev.kobj, &adm1025_group_opt); | 543 | sysfs_remove_group(&client->dev.kobj, &adm1025_group_opt); |
544 | 544 | ||