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/w83627ehf.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/w83627ehf.c')
-rw-r--r-- | drivers/hwmon/w83627ehf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index e3dfc52b5995..b15c6a998b72 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c | |||
@@ -256,7 +256,7 @@ struct w83627ehf_data { | |||
256 | int addr; /* IO base of hw monitor block */ | 256 | int addr; /* IO base of hw monitor block */ |
257 | const char *name; | 257 | const char *name; |
258 | 258 | ||
259 | struct class_device *class_dev; | 259 | struct device *hwmon_dev; |
260 | struct mutex lock; | 260 | struct mutex lock; |
261 | 261 | ||
262 | struct mutex update_lock; | 262 | struct mutex update_lock; |
@@ -1384,9 +1384,9 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev) | |||
1384 | goto exit_remove; | 1384 | goto exit_remove; |
1385 | } | 1385 | } |
1386 | 1386 | ||
1387 | data->class_dev = hwmon_device_register(dev); | 1387 | data->hwmon_dev = hwmon_device_register(dev); |
1388 | if (IS_ERR(data->class_dev)) { | 1388 | if (IS_ERR(data->hwmon_dev)) { |
1389 | err = PTR_ERR(data->class_dev); | 1389 | err = PTR_ERR(data->hwmon_dev); |
1390 | goto exit_remove; | 1390 | goto exit_remove; |
1391 | } | 1391 | } |
1392 | 1392 | ||
@@ -1406,7 +1406,7 @@ static int __devexit w83627ehf_remove(struct platform_device *pdev) | |||
1406 | { | 1406 | { |
1407 | struct w83627ehf_data *data = platform_get_drvdata(pdev); | 1407 | struct w83627ehf_data *data = platform_get_drvdata(pdev); |
1408 | 1408 | ||
1409 | hwmon_device_unregister(data->class_dev); | 1409 | hwmon_device_unregister(data->hwmon_dev); |
1410 | w83627ehf_device_remove_files(&pdev->dev); | 1410 | w83627ehf_device_remove_files(&pdev->dev); |
1411 | release_region(data->addr, IOREGION_LENGTH); | 1411 | release_region(data->addr, IOREGION_LENGTH); |
1412 | platform_set_drvdata(pdev, NULL); | 1412 | platform_set_drvdata(pdev, NULL); |