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/w83792d.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/w83792d.c')
-rw-r--r-- | drivers/hwmon/w83792d.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c index f6dee3800628..f836198b705c 100644 --- a/drivers/hwmon/w83792d.c +++ b/drivers/hwmon/w83792d.c | |||
@@ -267,7 +267,7 @@ DIV_TO_REG(long val) | |||
267 | 267 | ||
268 | struct w83792d_data { | 268 | struct w83792d_data { |
269 | struct i2c_client client; | 269 | struct i2c_client client; |
270 | struct class_device *class_dev; | 270 | struct device *hwmon_dev; |
271 | enum chips type; | 271 | enum chips type; |
272 | 272 | ||
273 | struct mutex update_lock; | 273 | struct mutex update_lock; |
@@ -1443,9 +1443,9 @@ w83792d_detect(struct i2c_adapter *adapter, int address, int kind) | |||
1443 | &w83792d_group_fan[3]))) | 1443 | &w83792d_group_fan[3]))) |
1444 | goto exit_remove_files; | 1444 | goto exit_remove_files; |
1445 | 1445 | ||
1446 | data->class_dev = hwmon_device_register(dev); | 1446 | data->hwmon_dev = hwmon_device_register(dev); |
1447 | if (IS_ERR(data->class_dev)) { | 1447 | if (IS_ERR(data->hwmon_dev)) { |
1448 | err = PTR_ERR(data->class_dev); | 1448 | err = PTR_ERR(data->hwmon_dev); |
1449 | goto exit_remove_files; | 1449 | goto exit_remove_files; |
1450 | } | 1450 | } |
1451 | 1451 | ||
@@ -1480,7 +1480,7 @@ w83792d_detach_client(struct i2c_client *client) | |||
1480 | 1480 | ||
1481 | /* main client */ | 1481 | /* main client */ |
1482 | if (data) { | 1482 | if (data) { |
1483 | hwmon_device_unregister(data->class_dev); | 1483 | hwmon_device_unregister(data->hwmon_dev); |
1484 | sysfs_remove_group(&client->dev.kobj, &w83792d_group); | 1484 | sysfs_remove_group(&client->dev.kobj, &w83792d_group); |
1485 | for (i = 0; i < ARRAY_SIZE(w83792d_group_fan); i++) | 1485 | for (i = 0; i < ARRAY_SIZE(w83792d_group_fan); i++) |
1486 | sysfs_remove_group(&client->dev.kobj, | 1486 | sysfs_remove_group(&client->dev.kobj, |