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/lm85.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/lm85.c')
-rw-r--r-- | drivers/hwmon/lm85.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c index 20a8c648280d..954c364f38b4 100644 --- a/drivers/hwmon/lm85.c +++ b/drivers/hwmon/lm85.c | |||
@@ -328,7 +328,7 @@ struct lm85_autofan { | |||
328 | The structure is dynamically allocated. */ | 328 | The structure is dynamically allocated. */ |
329 | struct lm85_data { | 329 | struct lm85_data { |
330 | struct i2c_client client; | 330 | struct i2c_client client; |
331 | struct class_device *class_dev; | 331 | struct device *hwmon_dev; |
332 | enum chips type; | 332 | enum chips type; |
333 | 333 | ||
334 | struct mutex update_lock; | 334 | struct mutex update_lock; |
@@ -1257,9 +1257,9 @@ static int lm85_detect(struct i2c_adapter *adapter, int address, | |||
1257 | &dev_attr_in4_max))) | 1257 | &dev_attr_in4_max))) |
1258 | goto ERROR3; | 1258 | goto ERROR3; |
1259 | 1259 | ||
1260 | data->class_dev = hwmon_device_register(&new_client->dev); | 1260 | data->hwmon_dev = hwmon_device_register(&new_client->dev); |
1261 | if (IS_ERR(data->class_dev)) { | 1261 | if (IS_ERR(data->hwmon_dev)) { |
1262 | err = PTR_ERR(data->class_dev); | 1262 | err = PTR_ERR(data->hwmon_dev); |
1263 | goto ERROR3; | 1263 | goto ERROR3; |
1264 | } | 1264 | } |
1265 | 1265 | ||
@@ -1280,7 +1280,7 @@ static int lm85_detect(struct i2c_adapter *adapter, int address, | |||
1280 | static int lm85_detach_client(struct i2c_client *client) | 1280 | static int lm85_detach_client(struct i2c_client *client) |
1281 | { | 1281 | { |
1282 | struct lm85_data *data = i2c_get_clientdata(client); | 1282 | struct lm85_data *data = i2c_get_clientdata(client); |
1283 | hwmon_device_unregister(data->class_dev); | 1283 | hwmon_device_unregister(data->hwmon_dev); |
1284 | sysfs_remove_group(&client->dev.kobj, &lm85_group); | 1284 | sysfs_remove_group(&client->dev.kobj, &lm85_group); |
1285 | sysfs_remove_group(&client->dev.kobj, &lm85_group_opt); | 1285 | sysfs_remove_group(&client->dev.kobj, &lm85_group_opt); |
1286 | i2c_detach_client(client); | 1286 | i2c_detach_client(client); |