aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/lm80.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/lm80.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/lm80.c')
-rw-r--r--drivers/hwmon/lm80.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
index 064516d824ad..063cdba00a88 100644
--- a/drivers/hwmon/lm80.c
+++ b/drivers/hwmon/lm80.c
@@ -108,7 +108,7 @@ static inline long TEMP_FROM_REG(u16 temp)
108 108
109struct lm80_data { 109struct lm80_data {
110 struct i2c_client client; 110 struct i2c_client client;
111 struct class_device *class_dev; 111 struct device *hwmon_dev;
112 struct mutex update_lock; 112 struct mutex update_lock;
113 char valid; /* !=0 if following fields are valid */ 113 char valid; /* !=0 if following fields are valid */
114 unsigned long last_updated; /* In jiffies */ 114 unsigned long last_updated; /* In jiffies */
@@ -497,9 +497,9 @@ static int lm80_detect(struct i2c_adapter *adapter, int address, int kind)
497 if ((err = sysfs_create_group(&new_client->dev.kobj, &lm80_group))) 497 if ((err = sysfs_create_group(&new_client->dev.kobj, &lm80_group)))
498 goto error_detach; 498 goto error_detach;
499 499
500 data->class_dev = hwmon_device_register(&new_client->dev); 500 data->hwmon_dev = hwmon_device_register(&new_client->dev);
501 if (IS_ERR(data->class_dev)) { 501 if (IS_ERR(data->hwmon_dev)) {
502 err = PTR_ERR(data->class_dev); 502 err = PTR_ERR(data->hwmon_dev);
503 goto error_remove; 503 goto error_remove;
504 } 504 }
505 505
@@ -520,7 +520,7 @@ static int lm80_detach_client(struct i2c_client *client)
520 struct lm80_data *data = i2c_get_clientdata(client); 520 struct lm80_data *data = i2c_get_clientdata(client);
521 int err; 521 int err;
522 522
523 hwmon_device_unregister(data->class_dev); 523 hwmon_device_unregister(data->hwmon_dev);
524 sysfs_remove_group(&client->dev.kobj, &lm80_group); 524 sysfs_remove_group(&client->dev.kobj, &lm80_group);
525 if ((err = i2c_detach_client(client))) 525 if ((err = i2c_detach_client(client)))
526 return err; 526 return err;