diff options
Diffstat (limited to 'drivers/hwmon/pc87360.c')
-rw-r--r-- | drivers/hwmon/pc87360.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c index f57c75d59a5b..9d660133d517 100644 --- a/drivers/hwmon/pc87360.c +++ b/drivers/hwmon/pc87360.c | |||
@@ -180,7 +180,7 @@ static inline u8 PWM_TO_REG(int val, int inv) | |||
180 | 180 | ||
181 | struct pc87360_data { | 181 | struct pc87360_data { |
182 | const char *name; | 182 | const char *name; |
183 | struct class_device *class_dev; | 183 | struct device *hwmon_dev; |
184 | struct mutex lock; | 184 | struct mutex lock; |
185 | struct mutex update_lock; | 185 | struct mutex update_lock; |
186 | char valid; /* !=0 if following fields are valid */ | 186 | char valid; /* !=0 if following fields are valid */ |
@@ -500,7 +500,7 @@ static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL); | |||
500 | 500 | ||
501 | static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf) | 501 | static ssize_t show_vrm(struct device *dev, struct device_attribute *attr, char *buf) |
502 | { | 502 | { |
503 | struct pc87360_data *data = pc87360_update_device(dev); | 503 | struct pc87360_data *data = dev_get_drvdata(dev); |
504 | return sprintf(buf, "%u\n", data->vrm); | 504 | return sprintf(buf, "%u\n", data->vrm); |
505 | } | 505 | } |
506 | static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) | 506 | static ssize_t set_vrm(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
@@ -1054,9 +1054,9 @@ static int __devinit pc87360_probe(struct platform_device *pdev) | |||
1054 | if ((err = device_create_file(dev, &dev_attr_name))) | 1054 | if ((err = device_create_file(dev, &dev_attr_name))) |
1055 | goto ERROR3; | 1055 | goto ERROR3; |
1056 | 1056 | ||
1057 | data->class_dev = hwmon_device_register(dev); | 1057 | data->hwmon_dev = hwmon_device_register(dev); |
1058 | if (IS_ERR(data->class_dev)) { | 1058 | if (IS_ERR(data->hwmon_dev)) { |
1059 | err = PTR_ERR(data->class_dev); | 1059 | err = PTR_ERR(data->hwmon_dev); |
1060 | goto ERROR3; | 1060 | goto ERROR3; |
1061 | } | 1061 | } |
1062 | return 0; | 1062 | return 0; |
@@ -1083,7 +1083,7 @@ static int __devexit pc87360_remove(struct platform_device *pdev) | |||
1083 | struct pc87360_data *data = platform_get_drvdata(pdev); | 1083 | struct pc87360_data *data = platform_get_drvdata(pdev); |
1084 | int i; | 1084 | int i; |
1085 | 1085 | ||
1086 | hwmon_device_unregister(data->class_dev); | 1086 | hwmon_device_unregister(data->hwmon_dev); |
1087 | 1087 | ||
1088 | device_remove_file(&pdev->dev, &dev_attr_name); | 1088 | device_remove_file(&pdev->dev, &dev_attr_name); |
1089 | sysfs_remove_group(&pdev->dev.kobj, &pc8736x_temp_group); | 1089 | sysfs_remove_group(&pdev->dev.kobj, &pc8736x_temp_group); |