aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/gl518sm.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/gl518sm.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/gl518sm.c')
-rw-r--r--drivers/hwmon/gl518sm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c
index c103640455a3..bb58d9866a37 100644
--- a/drivers/hwmon/gl518sm.c
+++ b/drivers/hwmon/gl518sm.c
@@ -119,7 +119,7 @@ static inline u8 FAN_TO_REG(long rpm, int div)
119/* Each client has this additional data */ 119/* Each client has this additional data */
120struct gl518_data { 120struct gl518_data {
121 struct i2c_client client; 121 struct i2c_client client;
122 struct class_device *class_dev; 122 struct device *hwmon_dev;
123 enum chips type; 123 enum chips type;
124 124
125 struct mutex update_lock; 125 struct mutex update_lock;
@@ -460,9 +460,9 @@ static int gl518_detect(struct i2c_adapter *adapter, int address, int kind)
460 if ((err = sysfs_create_group(&new_client->dev.kobj, &gl518_group))) 460 if ((err = sysfs_create_group(&new_client->dev.kobj, &gl518_group)))
461 goto exit_detach; 461 goto exit_detach;
462 462
463 data->class_dev = hwmon_device_register(&new_client->dev); 463 data->hwmon_dev = hwmon_device_register(&new_client->dev);
464 if (IS_ERR(data->class_dev)) { 464 if (IS_ERR(data->hwmon_dev)) {
465 err = PTR_ERR(data->class_dev); 465 err = PTR_ERR(data->hwmon_dev);
466 goto exit_remove_files; 466 goto exit_remove_files;
467 } 467 }
468 468
@@ -502,7 +502,7 @@ static int gl518_detach_client(struct i2c_client *client)
502 struct gl518_data *data = i2c_get_clientdata(client); 502 struct gl518_data *data = i2c_get_clientdata(client);
503 int err; 503 int err;
504 504
505 hwmon_device_unregister(data->class_dev); 505 hwmon_device_unregister(data->hwmon_dev);
506 sysfs_remove_group(&client->dev.kobj, &gl518_group); 506 sysfs_remove_group(&client->dev.kobj, &gl518_group);
507 507
508 if ((err = i2c_detach_client(client))) 508 if ((err = i2c_detach_client(client)))