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/f71882fg.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/f71882fg.c')
-rw-r--r-- | drivers/hwmon/f71882fg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c index b4ff0f9a6af0..6db74434a02e 100644 --- a/drivers/hwmon/f71882fg.c +++ b/drivers/hwmon/f71882fg.c | |||
@@ -87,7 +87,7 @@ static inline u16 fan_from_reg ( u16 reg ); | |||
87 | 87 | ||
88 | struct f71882fg_data { | 88 | struct f71882fg_data { |
89 | unsigned short addr; | 89 | unsigned short addr; |
90 | struct class_device *class_dev; | 90 | struct device *hwmon_dev; |
91 | 91 | ||
92 | struct mutex update_lock; | 92 | struct mutex update_lock; |
93 | char valid; /* !=0 if following fields are valid */ | 93 | char valid; /* !=0 if following fields are valid */ |
@@ -781,9 +781,9 @@ static int __devinit f71882fg_probe(struct platform_device * pdev) | |||
781 | } | 781 | } |
782 | } | 782 | } |
783 | 783 | ||
784 | data->class_dev = hwmon_device_register(&pdev->dev); | 784 | data->hwmon_dev = hwmon_device_register(&pdev->dev); |
785 | if (IS_ERR(data->class_dev)) { | 785 | if (IS_ERR(data->hwmon_dev)) { |
786 | err = PTR_ERR(data->class_dev); | 786 | err = PTR_ERR(data->hwmon_dev); |
787 | goto exit_unregister_sysfs; | 787 | goto exit_unregister_sysfs; |
788 | } | 788 | } |
789 | 789 | ||
@@ -811,7 +811,7 @@ static int __devexit f71882fg_remove(struct platform_device *pdev) | |||
811 | struct f71882fg_data *data = platform_get_drvdata(pdev); | 811 | struct f71882fg_data *data = platform_get_drvdata(pdev); |
812 | 812 | ||
813 | platform_set_drvdata(pdev, NULL); | 813 | platform_set_drvdata(pdev, NULL); |
814 | hwmon_device_unregister(data->class_dev); | 814 | hwmon_device_unregister(data->hwmon_dev); |
815 | 815 | ||
816 | for (i = 0; i < ARRAY_SIZE(f71882fg_dev_attr); i++) | 816 | for (i = 0; i < ARRAY_SIZE(f71882fg_dev_attr); i++) |
817 | device_remove_file(&pdev->dev, &f71882fg_dev_attr[i]); | 817 | device_remove_file(&pdev->dev, &f71882fg_dev_attr[i]); |