aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/smsc47m192.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hwmon/smsc47m192.c')
-rw-r--r--drivers/hwmon/smsc47m192.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hwmon/smsc47m192.c b/drivers/hwmon/smsc47m192.c
index d3a3ba04cb0f..b87552652588 100644
--- a/drivers/hwmon/smsc47m192.c
+++ b/drivers/hwmon/smsc47m192.c
@@ -97,7 +97,7 @@ static inline int TEMP_FROM_REG(s8 val)
97 97
98struct smsc47m192_data { 98struct smsc47m192_data {
99 struct i2c_client client; 99 struct i2c_client client;
100 struct class_device *class_dev; 100 struct device *hwmon_dev;
101 struct mutex update_lock; 101 struct mutex update_lock;
102 char valid; /* !=0 if following fields are valid */ 102 char valid; /* !=0 if following fields are valid */
103 unsigned long last_updated; /* In jiffies */ 103 unsigned long last_updated; /* In jiffies */
@@ -334,7 +334,7 @@ static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
334static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, 334static ssize_t show_vrm(struct device *dev, struct device_attribute *attr,
335 char *buf) 335 char *buf)
336{ 336{
337 struct smsc47m192_data *data = smsc47m192_update_device(dev); 337 struct smsc47m192_data *data = dev_get_drvdata(dev);
338 return sprintf(buf, "%d\n", data->vrm); 338 return sprintf(buf, "%d\n", data->vrm);
339} 339}
340 340
@@ -553,9 +553,9 @@ static int smsc47m192_detect(struct i2c_adapter *adapter, int address,
553 goto exit_remove_files; 553 goto exit_remove_files;
554 } 554 }
555 555
556 data->class_dev = hwmon_device_register(&client->dev); 556 data->hwmon_dev = hwmon_device_register(&client->dev);
557 if (IS_ERR(data->class_dev)) { 557 if (IS_ERR(data->hwmon_dev)) {
558 err = PTR_ERR(data->class_dev); 558 err = PTR_ERR(data->hwmon_dev);
559 goto exit_remove_files; 559 goto exit_remove_files;
560 } 560 }
561 561
@@ -577,7 +577,7 @@ static int smsc47m192_detach_client(struct i2c_client *client)
577 struct smsc47m192_data *data = i2c_get_clientdata(client); 577 struct smsc47m192_data *data = i2c_get_clientdata(client);
578 int err; 578 int err;
579 579
580 hwmon_device_unregister(data->class_dev); 580 hwmon_device_unregister(data->hwmon_dev);
581 sysfs_remove_group(&client->dev.kobj, &smsc47m192_group); 581 sysfs_remove_group(&client->dev.kobj, &smsc47m192_group);
582 sysfs_remove_group(&client->dev.kobj, &smsc47m192_group_in4); 582 sysfs_remove_group(&client->dev.kobj, &smsc47m192_group_in4);
583 583