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/w83627hf.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/w83627hf.c')
-rw-r--r-- | drivers/hwmon/w83627hf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c index f0e0e208be9a..b1943ec29c48 100644 --- a/drivers/hwmon/w83627hf.c +++ b/drivers/hwmon/w83627hf.c | |||
@@ -346,7 +346,7 @@ static inline u8 DIV_TO_REG(long val) | |||
346 | struct w83627hf_data { | 346 | struct w83627hf_data { |
347 | unsigned short addr; | 347 | unsigned short addr; |
348 | const char *name; | 348 | const char *name; |
349 | struct class_device *class_dev; | 349 | struct device *hwmon_dev; |
350 | struct mutex lock; | 350 | struct mutex lock; |
351 | enum chips type; | 351 | enum chips type; |
352 | 352 | ||
@@ -1295,9 +1295,9 @@ static int __devinit w83627hf_probe(struct platform_device *pdev) | |||
1295 | || (err = device_create_file(dev, &dev_attr_pwm3_freq))) | 1295 | || (err = device_create_file(dev, &dev_attr_pwm3_freq))) |
1296 | goto ERROR4; | 1296 | goto ERROR4; |
1297 | 1297 | ||
1298 | data->class_dev = hwmon_device_register(dev); | 1298 | data->hwmon_dev = hwmon_device_register(dev); |
1299 | if (IS_ERR(data->class_dev)) { | 1299 | if (IS_ERR(data->hwmon_dev)) { |
1300 | err = PTR_ERR(data->class_dev); | 1300 | err = PTR_ERR(data->hwmon_dev); |
1301 | goto ERROR4; | 1301 | goto ERROR4; |
1302 | } | 1302 | } |
1303 | 1303 | ||
@@ -1320,7 +1320,7 @@ static int __devexit w83627hf_remove(struct platform_device *pdev) | |||
1320 | struct w83627hf_data *data = platform_get_drvdata(pdev); | 1320 | struct w83627hf_data *data = platform_get_drvdata(pdev); |
1321 | struct resource *res; | 1321 | struct resource *res; |
1322 | 1322 | ||
1323 | hwmon_device_unregister(data->class_dev); | 1323 | hwmon_device_unregister(data->hwmon_dev); |
1324 | 1324 | ||
1325 | sysfs_remove_group(&pdev->dev.kobj, &w83627hf_group); | 1325 | sysfs_remove_group(&pdev->dev.kobj, &w83627hf_group); |
1326 | sysfs_remove_group(&pdev->dev.kobj, &w83627hf_group_opt); | 1326 | sysfs_remove_group(&pdev->dev.kobj, &w83627hf_group_opt); |