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/adm1026.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/adm1026.c')
-rw-r--r-- | drivers/hwmon/adm1026.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c index ba80cd3258c6..b85370c7358b 100644 --- a/drivers/hwmon/adm1026.c +++ b/drivers/hwmon/adm1026.c | |||
@@ -260,7 +260,7 @@ struct pwm_data { | |||
260 | 260 | ||
261 | struct adm1026_data { | 261 | struct adm1026_data { |
262 | struct i2c_client client; | 262 | struct i2c_client client; |
263 | struct class_device *class_dev; | 263 | struct device *hwmon_dev; |
264 | enum chips type; | 264 | enum chips type; |
265 | 265 | ||
266 | struct mutex update_lock; | 266 | struct mutex update_lock; |
@@ -1676,9 +1676,9 @@ static int adm1026_detect(struct i2c_adapter *adapter, int address, | |||
1676 | if ((err = sysfs_create_group(&new_client->dev.kobj, &adm1026_group))) | 1676 | if ((err = sysfs_create_group(&new_client->dev.kobj, &adm1026_group))) |
1677 | goto exitdetach; | 1677 | goto exitdetach; |
1678 | 1678 | ||
1679 | data->class_dev = hwmon_device_register(&new_client->dev); | 1679 | data->hwmon_dev = hwmon_device_register(&new_client->dev); |
1680 | if (IS_ERR(data->class_dev)) { | 1680 | if (IS_ERR(data->hwmon_dev)) { |
1681 | err = PTR_ERR(data->class_dev); | 1681 | err = PTR_ERR(data->hwmon_dev); |
1682 | goto exitremove; | 1682 | goto exitremove; |
1683 | } | 1683 | } |
1684 | 1684 | ||
@@ -1698,7 +1698,7 @@ exit: | |||
1698 | static int adm1026_detach_client(struct i2c_client *client) | 1698 | static int adm1026_detach_client(struct i2c_client *client) |
1699 | { | 1699 | { |
1700 | struct adm1026_data *data = i2c_get_clientdata(client); | 1700 | struct adm1026_data *data = i2c_get_clientdata(client); |
1701 | hwmon_device_unregister(data->class_dev); | 1701 | hwmon_device_unregister(data->hwmon_dev); |
1702 | sysfs_remove_group(&client->dev.kobj, &adm1026_group); | 1702 | sysfs_remove_group(&client->dev.kobj, &adm1026_group); |
1703 | i2c_detach_client(client); | 1703 | i2c_detach_client(client); |
1704 | kfree(data); | 1704 | kfree(data); |