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/adt7470.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/adt7470.c')
-rw-r--r-- | drivers/hwmon/adt7470.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c index c4dc20546ec0..9810aaa0489d 100644 --- a/drivers/hwmon/adt7470.c +++ b/drivers/hwmon/adt7470.c | |||
@@ -124,7 +124,7 @@ I2C_CLIENT_INSMOD_1(adt7470); | |||
124 | 124 | ||
125 | struct adt7470_data { | 125 | struct adt7470_data { |
126 | struct i2c_client client; | 126 | struct i2c_client client; |
127 | struct class_device *class_dev; | 127 | struct device *hwmon_dev; |
128 | struct attribute_group attrs; | 128 | struct attribute_group attrs; |
129 | struct mutex lock; | 129 | struct mutex lock; |
130 | char sensors_valid; | 130 | char sensors_valid; |
@@ -1003,9 +1003,9 @@ static int adt7470_detect(struct i2c_adapter *adapter, int address, int kind) | |||
1003 | if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs))) | 1003 | if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs))) |
1004 | goto exit_detach; | 1004 | goto exit_detach; |
1005 | 1005 | ||
1006 | data->class_dev = hwmon_device_register(&client->dev); | 1006 | data->hwmon_dev = hwmon_device_register(&client->dev); |
1007 | if (IS_ERR(data->class_dev)) { | 1007 | if (IS_ERR(data->hwmon_dev)) { |
1008 | err = PTR_ERR(data->class_dev); | 1008 | err = PTR_ERR(data->hwmon_dev); |
1009 | goto exit_remove; | 1009 | goto exit_remove; |
1010 | } | 1010 | } |
1011 | 1011 | ||
@@ -1025,7 +1025,7 @@ static int adt7470_detach_client(struct i2c_client *client) | |||
1025 | { | 1025 | { |
1026 | struct adt7470_data *data = i2c_get_clientdata(client); | 1026 | struct adt7470_data *data = i2c_get_clientdata(client); |
1027 | 1027 | ||
1028 | hwmon_device_unregister(data->class_dev); | 1028 | hwmon_device_unregister(data->hwmon_dev); |
1029 | sysfs_remove_group(&client->dev.kobj, &data->attrs); | 1029 | sysfs_remove_group(&client->dev.kobj, &data->attrs); |
1030 | i2c_detach_client(client); | 1030 | i2c_detach_client(client); |
1031 | kfree(data); | 1031 | kfree(data); |