aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/fscher.c
diff options
context:
space:
mode:
authorTony Jones <tonyj@suse.de>2007-08-20 16:46:20 -0400
committerMark M. Hoffman <mhoffman@lightlink.com>2007-10-09 22:56:30 -0400
commit1beeffe43311f64df8dd0ab08ff6b1858c58363f (patch)
tree039324186049a69f3c791165e90404aef497f3cc /drivers/hwmon/fscher.c
parent59a35bafb223bbb0553ba1a3bb9280bda668a8d8 (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/fscher.c')
-rw-r--r--drivers/hwmon/fscher.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/fscher.c b/drivers/hwmon/fscher.c
index b34b546c68b8..e67c36953b2d 100644
--- a/drivers/hwmon/fscher.c
+++ b/drivers/hwmon/fscher.c
@@ -134,7 +134,7 @@ static struct i2c_driver fscher_driver = {
134 134
135struct fscher_data { 135struct fscher_data {
136 struct i2c_client client; 136 struct i2c_client client;
137 struct class_device *class_dev; 137 struct device *hwmon_dev;
138 struct mutex update_lock; 138 struct mutex update_lock;
139 char valid; /* zero until following fields are valid */ 139 char valid; /* zero until following fields are valid */
140 unsigned long last_updated; /* in jiffies */ 140 unsigned long last_updated; /* in jiffies */
@@ -344,9 +344,9 @@ static int fscher_detect(struct i2c_adapter *adapter, int address, int kind)
344 if ((err = sysfs_create_group(&new_client->dev.kobj, &fscher_group))) 344 if ((err = sysfs_create_group(&new_client->dev.kobj, &fscher_group)))
345 goto exit_detach; 345 goto exit_detach;
346 346
347 data->class_dev = hwmon_device_register(&new_client->dev); 347 data->hwmon_dev = hwmon_device_register(&new_client->dev);
348 if (IS_ERR(data->class_dev)) { 348 if (IS_ERR(data->hwmon_dev)) {
349 err = PTR_ERR(data->class_dev); 349 err = PTR_ERR(data->hwmon_dev);
350 goto exit_remove_files; 350 goto exit_remove_files;
351 } 351 }
352 352
@@ -367,7 +367,7 @@ static int fscher_detach_client(struct i2c_client *client)
367 struct fscher_data *data = i2c_get_clientdata(client); 367 struct fscher_data *data = i2c_get_clientdata(client);
368 int err; 368 int err;
369 369
370 hwmon_device_unregister(data->class_dev); 370 hwmon_device_unregister(data->hwmon_dev);
371 sysfs_remove_group(&client->dev.kobj, &fscher_group); 371 sysfs_remove_group(&client->dev.kobj, &fscher_group);
372 372
373 if ((err = i2c_detach_client(client))) 373 if ((err = i2c_detach_client(client)))