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/via686a.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/via686a.c')
-rw-r--r-- | drivers/hwmon/via686a.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c index 696c8a2e5374..8f63dada6019 100644 --- a/drivers/hwmon/via686a.c +++ b/drivers/hwmon/via686a.c | |||
@@ -294,7 +294,7 @@ static inline long TEMP_FROM_REG10(u16 val) | |||
294 | struct via686a_data { | 294 | struct via686a_data { |
295 | unsigned short addr; | 295 | unsigned short addr; |
296 | const char *name; | 296 | const char *name; |
297 | struct class_device *class_dev; | 297 | struct device *hwmon_dev; |
298 | struct mutex update_lock; | 298 | struct mutex update_lock; |
299 | char valid; /* !=0 if following fields are valid */ | 299 | char valid; /* !=0 if following fields are valid */ |
300 | unsigned long last_updated; /* In jiffies */ | 300 | unsigned long last_updated; /* In jiffies */ |
@@ -627,9 +627,9 @@ static int __devinit via686a_probe(struct platform_device *pdev) | |||
627 | if ((err = sysfs_create_group(&pdev->dev.kobj, &via686a_group))) | 627 | if ((err = sysfs_create_group(&pdev->dev.kobj, &via686a_group))) |
628 | goto exit_free; | 628 | goto exit_free; |
629 | 629 | ||
630 | data->class_dev = hwmon_device_register(&pdev->dev); | 630 | data->hwmon_dev = hwmon_device_register(&pdev->dev); |
631 | if (IS_ERR(data->class_dev)) { | 631 | if (IS_ERR(data->hwmon_dev)) { |
632 | err = PTR_ERR(data->class_dev); | 632 | err = PTR_ERR(data->hwmon_dev); |
633 | goto exit_remove_files; | 633 | goto exit_remove_files; |
634 | } | 634 | } |
635 | 635 | ||
@@ -648,7 +648,7 @@ static int __devexit via686a_remove(struct platform_device *pdev) | |||
648 | { | 648 | { |
649 | struct via686a_data *data = platform_get_drvdata(pdev); | 649 | struct via686a_data *data = platform_get_drvdata(pdev); |
650 | 650 | ||
651 | hwmon_device_unregister(data->class_dev); | 651 | hwmon_device_unregister(data->hwmon_dev); |
652 | sysfs_remove_group(&pdev->dev.kobj, &via686a_group); | 652 | sysfs_remove_group(&pdev->dev.kobj, &via686a_group); |
653 | 653 | ||
654 | release_region(data->addr, VIA686A_EXTENT); | 654 | release_region(data->addr, VIA686A_EXTENT); |