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/ad7418.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/ad7418.c')
-rw-r--r-- | drivers/hwmon/ad7418.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/ad7418.c b/drivers/hwmon/ad7418.c index 879ea72ee3bd..fcd7fe78f3f9 100644 --- a/drivers/hwmon/ad7418.c +++ b/drivers/hwmon/ad7418.c | |||
@@ -47,7 +47,7 @@ static const u8 AD7418_REG_TEMP[] = { AD7418_REG_TEMP_IN, | |||
47 | 47 | ||
48 | struct ad7418_data { | 48 | struct ad7418_data { |
49 | struct i2c_client client; | 49 | struct i2c_client client; |
50 | struct class_device *class_dev; | 50 | struct device *hwmon_dev; |
51 | struct attribute_group attrs; | 51 | struct attribute_group attrs; |
52 | enum chips type; | 52 | enum chips type; |
53 | struct mutex lock; | 53 | struct mutex lock; |
@@ -326,9 +326,9 @@ static int ad7418_detect(struct i2c_adapter *adapter, int address, int kind) | |||
326 | if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs))) | 326 | if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs))) |
327 | goto exit_detach; | 327 | goto exit_detach; |
328 | 328 | ||
329 | data->class_dev = hwmon_device_register(&client->dev); | 329 | data->hwmon_dev = hwmon_device_register(&client->dev); |
330 | if (IS_ERR(data->class_dev)) { | 330 | if (IS_ERR(data->hwmon_dev)) { |
331 | err = PTR_ERR(data->class_dev); | 331 | err = PTR_ERR(data->hwmon_dev); |
332 | goto exit_remove; | 332 | goto exit_remove; |
333 | } | 333 | } |
334 | 334 | ||
@@ -347,7 +347,7 @@ exit: | |||
347 | static int ad7418_detach_client(struct i2c_client *client) | 347 | static int ad7418_detach_client(struct i2c_client *client) |
348 | { | 348 | { |
349 | struct ad7418_data *data = i2c_get_clientdata(client); | 349 | struct ad7418_data *data = i2c_get_clientdata(client); |
350 | hwmon_device_unregister(data->class_dev); | 350 | hwmon_device_unregister(data->hwmon_dev); |
351 | sysfs_remove_group(&client->dev.kobj, &data->attrs); | 351 | sysfs_remove_group(&client->dev.kobj, &data->attrs); |
352 | i2c_detach_client(client); | 352 | i2c_detach_client(client); |
353 | kfree(data); | 353 | kfree(data); |