aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/f71805f.c
diff options
context:
space:
mode:
authorTony Jones <tonyj@suse.de>2007-08-20 16:46:20 -0400
committerMark M. Hoffman <mhoffman@lightlink.com>2007-10-09 22:56:30 -0400
commit1beeffe43311f64df8dd0ab08ff6b1858c58363f (patch)
tree039324186049a69f3c791165e90404aef497f3cc /drivers/hwmon/f71805f.c
parent59a35bafb223bbb0553ba1a3bb9280bda668a8d8 (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/f71805f.c')
-rw-r--r--drivers/hwmon/f71805f.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 1cd71a5be0ea..5d9d5cc816a2 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -162,7 +162,7 @@ struct f71805f_auto_point {
162struct f71805f_data { 162struct f71805f_data {
163 unsigned short addr; 163 unsigned short addr;
164 const char *name; 164 const char *name;
165 struct class_device *class_dev; 165 struct device *hwmon_dev;
166 166
167 struct mutex update_lock; 167 struct mutex update_lock;
168 char valid; /* !=0 if following fields are valid */ 168 char valid; /* !=0 if following fields are valid */
@@ -1381,9 +1381,9 @@ static int __devinit f71805f_probe(struct platform_device *pdev)
1381 } 1381 }
1382 } 1382 }
1383 1383
1384 data->class_dev = hwmon_device_register(&pdev->dev); 1384 data->hwmon_dev = hwmon_device_register(&pdev->dev);
1385 if (IS_ERR(data->class_dev)) { 1385 if (IS_ERR(data->hwmon_dev)) {
1386 err = PTR_ERR(data->class_dev); 1386 err = PTR_ERR(data->hwmon_dev);
1387 dev_err(&pdev->dev, "Class registration failed (%d)\n", err); 1387 dev_err(&pdev->dev, "Class registration failed (%d)\n", err);
1388 goto exit_remove_files; 1388 goto exit_remove_files;
1389 } 1389 }
@@ -1410,7 +1410,7 @@ static int __devexit f71805f_remove(struct platform_device *pdev)
1410 struct resource *res; 1410 struct resource *res;
1411 int i; 1411 int i;
1412 1412
1413 hwmon_device_unregister(data->class_dev); 1413 hwmon_device_unregister(data->hwmon_dev);
1414 sysfs_remove_group(&pdev->dev.kobj, &f71805f_group); 1414 sysfs_remove_group(&pdev->dev.kobj, &f71805f_group);
1415 for (i = 0; i < 4; i++) 1415 for (i = 0; i < 4; i++)
1416 sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]); 1416 sysfs_remove_group(&pdev->dev.kobj, &f71805f_group_optin[i]);