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/fscpos.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/fscpos.c')
-rw-r--r-- | drivers/hwmon/fscpos.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/fscpos.c b/drivers/hwmon/fscpos.c index ea506a77f9c9..92c9703d0ac0 100644 --- a/drivers/hwmon/fscpos.c +++ b/drivers/hwmon/fscpos.c | |||
@@ -115,7 +115,7 @@ static struct i2c_driver fscpos_driver = { | |||
115 | */ | 115 | */ |
116 | struct fscpos_data { | 116 | struct fscpos_data { |
117 | struct i2c_client client; | 117 | struct i2c_client client; |
118 | struct class_device *class_dev; | 118 | struct device *hwmon_dev; |
119 | struct mutex update_lock; | 119 | struct mutex update_lock; |
120 | char valid; /* 0 until following fields are valid */ | 120 | char valid; /* 0 until following fields are valid */ |
121 | unsigned long last_updated; /* In jiffies */ | 121 | unsigned long last_updated; /* In jiffies */ |
@@ -539,9 +539,9 @@ static int fscpos_detect(struct i2c_adapter *adapter, int address, int kind) | |||
539 | if ((err = sysfs_create_group(&new_client->dev.kobj, &fscpos_group))) | 539 | if ((err = sysfs_create_group(&new_client->dev.kobj, &fscpos_group))) |
540 | goto exit_detach; | 540 | goto exit_detach; |
541 | 541 | ||
542 | data->class_dev = hwmon_device_register(&new_client->dev); | 542 | data->hwmon_dev = hwmon_device_register(&new_client->dev); |
543 | if (IS_ERR(data->class_dev)) { | 543 | if (IS_ERR(data->hwmon_dev)) { |
544 | err = PTR_ERR(data->class_dev); | 544 | err = PTR_ERR(data->hwmon_dev); |
545 | goto exit_remove_files; | 545 | goto exit_remove_files; |
546 | } | 546 | } |
547 | 547 | ||
@@ -562,7 +562,7 @@ static int fscpos_detach_client(struct i2c_client *client) | |||
562 | struct fscpos_data *data = i2c_get_clientdata(client); | 562 | struct fscpos_data *data = i2c_get_clientdata(client); |
563 | int err; | 563 | int err; |
564 | 564 | ||
565 | hwmon_device_unregister(data->class_dev); | 565 | hwmon_device_unregister(data->hwmon_dev); |
566 | sysfs_remove_group(&client->dev.kobj, &fscpos_group); | 566 | sysfs_remove_group(&client->dev.kobj, &fscpos_group); |
567 | 567 | ||
568 | if ((err = i2c_detach_client(client))) | 568 | if ((err = i2c_detach_client(client))) |