diff options
author | Tony Jones <tonyj@suse.de> | 2007-08-20 16:46:20 -0400 |
---|---|---|
committer | Mark M. Hoffman <mhoffman@lightlink.com> | 2007-10-09 22:56:30 -0400 |
commit | 1beeffe43311f64df8dd0ab08ff6b1858c58363f (patch) | |
tree | 039324186049a69f3c791165e90404aef497f3cc /drivers/hwmon/coretemp.c | |
parent | 59a35bafb223bbb0553ba1a3bb9280bda668a8d8 (diff) |
hwmon: Convert from class_device to device
Convert from class_device to device for hwmon_device_register/unregister
Signed-off-by: Tony Jones <tonyj@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Diffstat (limited to 'drivers/hwmon/coretemp.c')
-rw-r--r-- | drivers/hwmon/coretemp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index f7b0ef41d9cd..1a0ff8d42bb2 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c | |||
@@ -47,7 +47,7 @@ typedef enum { SHOW_TEMP, SHOW_TJMAX, SHOW_LABEL, SHOW_NAME } SHOW; | |||
47 | static struct coretemp_data *coretemp_update_device(struct device *dev); | 47 | static struct coretemp_data *coretemp_update_device(struct device *dev); |
48 | 48 | ||
49 | struct coretemp_data { | 49 | struct coretemp_data { |
50 | struct class_device *class_dev; | 50 | struct device *hwmon_dev; |
51 | struct mutex update_lock; | 51 | struct mutex update_lock; |
52 | const char *name; | 52 | const char *name; |
53 | u32 id; | 53 | u32 id; |
@@ -226,9 +226,9 @@ static int __devinit coretemp_probe(struct platform_device *pdev) | |||
226 | if ((err = sysfs_create_group(&pdev->dev.kobj, &coretemp_group))) | 226 | if ((err = sysfs_create_group(&pdev->dev.kobj, &coretemp_group))) |
227 | goto exit_free; | 227 | goto exit_free; |
228 | 228 | ||
229 | data->class_dev = hwmon_device_register(&pdev->dev); | 229 | data->hwmon_dev = hwmon_device_register(&pdev->dev); |
230 | if (IS_ERR(data->class_dev)) { | 230 | if (IS_ERR(data->hwmon_dev)) { |
231 | err = PTR_ERR(data->class_dev); | 231 | err = PTR_ERR(data->hwmon_dev); |
232 | dev_err(&pdev->dev, "Class registration failed (%d)\n", | 232 | dev_err(&pdev->dev, "Class registration failed (%d)\n", |
233 | err); | 233 | err); |
234 | goto exit_class; | 234 | goto exit_class; |
@@ -248,7 +248,7 @@ static int __devexit coretemp_remove(struct platform_device *pdev) | |||
248 | { | 248 | { |
249 | struct coretemp_data *data = platform_get_drvdata(pdev); | 249 | struct coretemp_data *data = platform_get_drvdata(pdev); |
250 | 250 | ||
251 | hwmon_device_unregister(data->class_dev); | 251 | hwmon_device_unregister(data->hwmon_dev); |
252 | sysfs_remove_group(&pdev->dev.kobj, &coretemp_group); | 252 | sysfs_remove_group(&pdev->dev.kobj, &coretemp_group); |
253 | platform_set_drvdata(pdev, NULL); | 253 | platform_set_drvdata(pdev, NULL); |
254 | kfree(data); | 254 | kfree(data); |