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/lm63.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/lm63.c')
-rw-r--r-- | drivers/hwmon/lm63.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c index 2162d69a8c06..f207434730de 100644 --- a/drivers/hwmon/lm63.c +++ b/drivers/hwmon/lm63.c | |||
@@ -154,7 +154,7 @@ static struct i2c_driver lm63_driver = { | |||
154 | 154 | ||
155 | struct lm63_data { | 155 | struct lm63_data { |
156 | struct i2c_client client; | 156 | struct i2c_client client; |
157 | struct class_device *class_dev; | 157 | struct device *hwmon_dev; |
158 | struct mutex update_lock; | 158 | struct mutex update_lock; |
159 | char valid; /* zero until following fields are valid */ | 159 | char valid; /* zero until following fields are valid */ |
160 | unsigned long last_updated; /* in jiffies */ | 160 | unsigned long last_updated; /* in jiffies */ |
@@ -502,9 +502,9 @@ static int lm63_detect(struct i2c_adapter *adapter, int address, int kind) | |||
502 | goto exit_remove_files; | 502 | goto exit_remove_files; |
503 | } | 503 | } |
504 | 504 | ||
505 | data->class_dev = hwmon_device_register(&new_client->dev); | 505 | data->hwmon_dev = hwmon_device_register(&new_client->dev); |
506 | if (IS_ERR(data->class_dev)) { | 506 | if (IS_ERR(data->hwmon_dev)) { |
507 | err = PTR_ERR(data->class_dev); | 507 | err = PTR_ERR(data->hwmon_dev); |
508 | goto exit_remove_files; | 508 | goto exit_remove_files; |
509 | } | 509 | } |
510 | 510 | ||
@@ -561,7 +561,7 @@ static int lm63_detach_client(struct i2c_client *client) | |||
561 | struct lm63_data *data = i2c_get_clientdata(client); | 561 | struct lm63_data *data = i2c_get_clientdata(client); |
562 | int err; | 562 | int err; |
563 | 563 | ||
564 | hwmon_device_unregister(data->class_dev); | 564 | hwmon_device_unregister(data->hwmon_dev); |
565 | sysfs_remove_group(&client->dev.kobj, &lm63_group); | 565 | sysfs_remove_group(&client->dev.kobj, &lm63_group); |
566 | sysfs_remove_group(&client->dev.kobj, &lm63_group_fan1); | 566 | sysfs_remove_group(&client->dev.kobj, &lm63_group_fan1); |
567 | 567 | ||