aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/atxp1.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/atxp1.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/atxp1.c')
-rw-r--r--drivers/hwmon/atxp1.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c
index 0ccdd0750c44..cce3350e539e 100644
--- a/drivers/hwmon/atxp1.c
+++ b/drivers/hwmon/atxp1.c
@@ -61,7 +61,7 @@ static struct i2c_driver atxp1_driver = {
61 61
62struct atxp1_data { 62struct atxp1_data {
63 struct i2c_client client; 63 struct i2c_client client;
64 struct class_device *class_dev; 64 struct device *hwmon_dev;
65 struct mutex update_lock; 65 struct mutex update_lock;
66 unsigned long last_updated; 66 unsigned long last_updated;
67 u8 valid; 67 u8 valid;
@@ -335,9 +335,9 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
335 if ((err = sysfs_create_group(&new_client->dev.kobj, &atxp1_group))) 335 if ((err = sysfs_create_group(&new_client->dev.kobj, &atxp1_group)))
336 goto exit_detach; 336 goto exit_detach;
337 337
338 data->class_dev = hwmon_device_register(&new_client->dev); 338 data->hwmon_dev = hwmon_device_register(&new_client->dev);
339 if (IS_ERR(data->class_dev)) { 339 if (IS_ERR(data->hwmon_dev)) {
340 err = PTR_ERR(data->class_dev); 340 err = PTR_ERR(data->hwmon_dev);
341 goto exit_remove_files; 341 goto exit_remove_files;
342 } 342 }
343 343
@@ -361,7 +361,7 @@ static int atxp1_detach_client(struct i2c_client * client)
361 struct atxp1_data * data = i2c_get_clientdata(client); 361 struct atxp1_data * data = i2c_get_clientdata(client);
362 int err; 362 int err;
363 363
364 hwmon_device_unregister(data->class_dev); 364 hwmon_device_unregister(data->hwmon_dev);
365 sysfs_remove_group(&client->dev.kobj, &atxp1_group); 365 sysfs_remove_group(&client->dev.kobj, &atxp1_group);
366 366
367 err = i2c_detach_client(client); 367 err = i2c_detach_client(client);