aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/smsc47b397.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/smsc47b397.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/smsc47b397.c')
-rw-r--r--drivers/hwmon/smsc47b397.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index 45266b30ce1d..0b57d2ea2cf7 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -94,7 +94,7 @@ static u8 smsc47b397_reg_temp[] = {0x25, 0x26, 0x27, 0x80};
94struct smsc47b397_data { 94struct smsc47b397_data {
95 unsigned short addr; 95 unsigned short addr;
96 const char *name; 96 const char *name;
97 struct class_device *class_dev; 97 struct device *hwmon_dev;
98 struct mutex lock; 98 struct mutex lock;
99 99
100 struct mutex update_lock; 100 struct mutex update_lock;
@@ -222,7 +222,7 @@ static int __devexit smsc47b397_remove(struct platform_device *pdev)
222 struct smsc47b397_data *data = platform_get_drvdata(pdev); 222 struct smsc47b397_data *data = platform_get_drvdata(pdev);
223 struct resource *res; 223 struct resource *res;
224 224
225 hwmon_device_unregister(data->class_dev); 225 hwmon_device_unregister(data->hwmon_dev);
226 sysfs_remove_group(&pdev->dev.kobj, &smsc47b397_group); 226 sysfs_remove_group(&pdev->dev.kobj, &smsc47b397_group);
227 res = platform_get_resource(pdev, IORESOURCE_IO, 0); 227 res = platform_get_resource(pdev, IORESOURCE_IO, 0);
228 release_region(res->start, SMSC_EXTENT); 228 release_region(res->start, SMSC_EXTENT);
@@ -272,9 +272,9 @@ static int __devinit smsc47b397_probe(struct platform_device *pdev)
272 if ((err = sysfs_create_group(&dev->kobj, &smsc47b397_group))) 272 if ((err = sysfs_create_group(&dev->kobj, &smsc47b397_group)))
273 goto error_free; 273 goto error_free;
274 274
275 data->class_dev = hwmon_device_register(dev); 275 data->hwmon_dev = hwmon_device_register(dev);
276 if (IS_ERR(data->class_dev)) { 276 if (IS_ERR(data->hwmon_dev)) {
277 err = PTR_ERR(data->class_dev); 277 err = PTR_ERR(data->hwmon_dev);
278 goto error_remove; 278 goto error_remove;
279 } 279 }
280 280