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/lm92.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/lm92.c')
-rw-r--r-- | drivers/hwmon/lm92.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/lm92.c b/drivers/hwmon/lm92.c index 30b536333f14..61d1bd1d5b6e 100644 --- a/drivers/hwmon/lm92.c +++ b/drivers/hwmon/lm92.c | |||
@@ -96,7 +96,7 @@ static struct i2c_driver lm92_driver; | |||
96 | /* Client data (each client gets its own) */ | 96 | /* Client data (each client gets its own) */ |
97 | struct lm92_data { | 97 | struct lm92_data { |
98 | struct i2c_client client; | 98 | struct i2c_client client; |
99 | struct class_device *class_dev; | 99 | struct device *hwmon_dev; |
100 | struct mutex update_lock; | 100 | struct mutex update_lock; |
101 | char valid; /* zero until following fields are valid */ | 101 | char valid; /* zero until following fields are valid */ |
102 | unsigned long last_updated; /* in jiffies */ | 102 | unsigned long last_updated; /* in jiffies */ |
@@ -379,9 +379,9 @@ static int lm92_detect(struct i2c_adapter *adapter, int address, int kind) | |||
379 | if ((err = sysfs_create_group(&new_client->dev.kobj, &lm92_group))) | 379 | if ((err = sysfs_create_group(&new_client->dev.kobj, &lm92_group))) |
380 | goto exit_detach; | 380 | goto exit_detach; |
381 | 381 | ||
382 | data->class_dev = hwmon_device_register(&new_client->dev); | 382 | data->hwmon_dev = hwmon_device_register(&new_client->dev); |
383 | if (IS_ERR(data->class_dev)) { | 383 | if (IS_ERR(data->hwmon_dev)) { |
384 | err = PTR_ERR(data->class_dev); | 384 | err = PTR_ERR(data->hwmon_dev); |
385 | goto exit_remove; | 385 | goto exit_remove; |
386 | } | 386 | } |
387 | 387 | ||
@@ -409,7 +409,7 @@ static int lm92_detach_client(struct i2c_client *client) | |||
409 | struct lm92_data *data = i2c_get_clientdata(client); | 409 | struct lm92_data *data = i2c_get_clientdata(client); |
410 | int err; | 410 | int err; |
411 | 411 | ||
412 | hwmon_device_unregister(data->class_dev); | 412 | hwmon_device_unregister(data->hwmon_dev); |
413 | sysfs_remove_group(&client->dev.kobj, &lm92_group); | 413 | sysfs_remove_group(&client->dev.kobj, &lm92_group); |
414 | 414 | ||
415 | if ((err = i2c_detach_client(client))) | 415 | if ((err = i2c_detach_client(client))) |