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/thmc50.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/thmc50.c')
-rw-r--r-- | drivers/hwmon/thmc50.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c index c920f394a5c2..981d1f1dc61f 100644 --- a/drivers/hwmon/thmc50.c +++ b/drivers/hwmon/thmc50.c | |||
@@ -61,7 +61,7 @@ const static u8 THMC50_REG_TEMP_MAX[] = { 0x39, 0x37, 0x2B }; | |||
61 | /* Each client has this additional data */ | 61 | /* Each client has this additional data */ |
62 | struct thmc50_data { | 62 | struct thmc50_data { |
63 | struct i2c_client client; | 63 | struct i2c_client client; |
64 | struct class_device *class_dev; | 64 | struct device *hwmon_dev; |
65 | 65 | ||
66 | struct mutex update_lock; | 66 | struct mutex update_lock; |
67 | enum chips type; | 67 | enum chips type; |
@@ -351,9 +351,9 @@ static int thmc50_detect(struct i2c_adapter *adapter, int address, int kind) | |||
351 | goto exit_remove_sysfs_thmc50; | 351 | goto exit_remove_sysfs_thmc50; |
352 | 352 | ||
353 | /* Register a new directory entry with module sensors */ | 353 | /* Register a new directory entry with module sensors */ |
354 | data->class_dev = hwmon_device_register(&client->dev); | 354 | data->hwmon_dev = hwmon_device_register(&client->dev); |
355 | if (IS_ERR(data->class_dev)) { | 355 | if (IS_ERR(data->hwmon_dev)) { |
356 | err = PTR_ERR(data->class_dev); | 356 | err = PTR_ERR(data->hwmon_dev); |
357 | goto exit_remove_sysfs; | 357 | goto exit_remove_sysfs; |
358 | } | 358 | } |
359 | 359 | ||
@@ -384,7 +384,7 @@ static int thmc50_detach_client(struct i2c_client *client) | |||
384 | struct thmc50_data *data = i2c_get_clientdata(client); | 384 | struct thmc50_data *data = i2c_get_clientdata(client); |
385 | int err; | 385 | int err; |
386 | 386 | ||
387 | hwmon_device_unregister(data->class_dev); | 387 | hwmon_device_unregister(data->hwmon_dev); |
388 | sysfs_remove_group(&client->dev.kobj, &thmc50_group); | 388 | sysfs_remove_group(&client->dev.kobj, &thmc50_group); |
389 | if (data->type == adm1022) | 389 | if (data->type == adm1022) |
390 | sysfs_remove_group(&client->dev.kobj, &adm1022_group); | 390 | sysfs_remove_group(&client->dev.kobj, &adm1022_group); |