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/ds1621.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/ds1621.c')
-rw-r--r-- | drivers/hwmon/ds1621.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c index 5a861f936120..b7bd000b130f 100644 --- a/drivers/hwmon/ds1621.c +++ b/drivers/hwmon/ds1621.c | |||
@@ -73,7 +73,7 @@ static const u8 DS1621_REG_TEMP[3] = { | |||
73 | /* Each client has this additional data */ | 73 | /* Each client has this additional data */ |
74 | struct ds1621_data { | 74 | struct ds1621_data { |
75 | struct i2c_client client; | 75 | struct i2c_client client; |
76 | struct class_device *class_dev; | 76 | struct device *hwmon_dev; |
77 | struct mutex update_lock; | 77 | struct mutex update_lock; |
78 | char valid; /* !=0 if following fields are valid */ | 78 | char valid; /* !=0 if following fields are valid */ |
79 | unsigned long last_updated; /* In jiffies */ | 79 | unsigned long last_updated; /* In jiffies */ |
@@ -266,9 +266,9 @@ static int ds1621_detect(struct i2c_adapter *adapter, int address, | |||
266 | if ((err = sysfs_create_group(&client->dev.kobj, &ds1621_group))) | 266 | if ((err = sysfs_create_group(&client->dev.kobj, &ds1621_group))) |
267 | goto exit_detach; | 267 | goto exit_detach; |
268 | 268 | ||
269 | data->class_dev = hwmon_device_register(&client->dev); | 269 | data->hwmon_dev = hwmon_device_register(&client->dev); |
270 | if (IS_ERR(data->class_dev)) { | 270 | if (IS_ERR(data->hwmon_dev)) { |
271 | err = PTR_ERR(data->class_dev); | 271 | err = PTR_ERR(data->hwmon_dev); |
272 | goto exit_remove_files; | 272 | goto exit_remove_files; |
273 | } | 273 | } |
274 | 274 | ||
@@ -289,7 +289,7 @@ static int ds1621_detach_client(struct i2c_client *client) | |||
289 | struct ds1621_data *data = i2c_get_clientdata(client); | 289 | struct ds1621_data *data = i2c_get_clientdata(client); |
290 | int err; | 290 | int err; |
291 | 291 | ||
292 | hwmon_device_unregister(data->class_dev); | 292 | hwmon_device_unregister(data->hwmon_dev); |
293 | sysfs_remove_group(&client->dev.kobj, &ds1621_group); | 293 | sysfs_remove_group(&client->dev.kobj, &ds1621_group); |
294 | 294 | ||
295 | if ((err = i2c_detach_client(client))) | 295 | if ((err = i2c_detach_client(client))) |