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/max1619.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/max1619.c')
-rw-r--r-- | drivers/hwmon/max1619.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/max1619.c b/drivers/hwmon/max1619.c index 2f58f651f03a..38a44c3d6cee 100644 --- a/drivers/hwmon/max1619.c +++ b/drivers/hwmon/max1619.c | |||
@@ -105,7 +105,7 @@ static struct i2c_driver max1619_driver = { | |||
105 | 105 | ||
106 | struct max1619_data { | 106 | struct max1619_data { |
107 | struct i2c_client client; | 107 | struct i2c_client client; |
108 | struct class_device *class_dev; | 108 | struct device *hwmon_dev; |
109 | struct mutex update_lock; | 109 | struct mutex update_lock; |
110 | char valid; /* zero until following fields are valid */ | 110 | char valid; /* zero until following fields are valid */ |
111 | unsigned long last_updated; /* in jiffies */ | 111 | unsigned long last_updated; /* in jiffies */ |
@@ -293,9 +293,9 @@ static int max1619_detect(struct i2c_adapter *adapter, int address, int kind) | |||
293 | if ((err = sysfs_create_group(&new_client->dev.kobj, &max1619_group))) | 293 | if ((err = sysfs_create_group(&new_client->dev.kobj, &max1619_group))) |
294 | goto exit_detach; | 294 | goto exit_detach; |
295 | 295 | ||
296 | data->class_dev = hwmon_device_register(&new_client->dev); | 296 | data->hwmon_dev = hwmon_device_register(&new_client->dev); |
297 | if (IS_ERR(data->class_dev)) { | 297 | if (IS_ERR(data->hwmon_dev)) { |
298 | err = PTR_ERR(data->class_dev); | 298 | err = PTR_ERR(data->hwmon_dev); |
299 | goto exit_remove_files; | 299 | goto exit_remove_files; |
300 | } | 300 | } |
301 | 301 | ||
@@ -331,7 +331,7 @@ static int max1619_detach_client(struct i2c_client *client) | |||
331 | struct max1619_data *data = i2c_get_clientdata(client); | 331 | struct max1619_data *data = i2c_get_clientdata(client); |
332 | int err; | 332 | int err; |
333 | 333 | ||
334 | hwmon_device_unregister(data->class_dev); | 334 | hwmon_device_unregister(data->hwmon_dev); |
335 | sysfs_remove_group(&client->dev.kobj, &max1619_group); | 335 | sysfs_remove_group(&client->dev.kobj, &max1619_group); |
336 | 336 | ||
337 | if ((err = i2c_detach_client(client))) | 337 | if ((err = i2c_detach_client(client))) |