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/it87.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/it87.c')
-rw-r--r-- | drivers/hwmon/it87.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index d75dba9b810b..41a90e5613bc 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c | |||
@@ -222,7 +222,7 @@ struct it87_sio_data { | |||
222 | /* For each registered chip, we need to keep some data in memory. | 222 | /* For each registered chip, we need to keep some data in memory. |
223 | The structure is dynamically allocated. */ | 223 | The structure is dynamically allocated. */ |
224 | struct it87_data { | 224 | struct it87_data { |
225 | struct class_device *class_dev; | 225 | struct device *hwmon_dev; |
226 | enum chips type; | 226 | enum chips type; |
227 | 227 | ||
228 | unsigned short addr; | 228 | unsigned short addr; |
@@ -1089,9 +1089,9 @@ static int __devinit it87_probe(struct platform_device *pdev) | |||
1089 | goto ERROR4; | 1089 | goto ERROR4; |
1090 | } | 1090 | } |
1091 | 1091 | ||
1092 | data->class_dev = hwmon_device_register(dev); | 1092 | data->hwmon_dev = hwmon_device_register(dev); |
1093 | if (IS_ERR(data->class_dev)) { | 1093 | if (IS_ERR(data->hwmon_dev)) { |
1094 | err = PTR_ERR(data->class_dev); | 1094 | err = PTR_ERR(data->hwmon_dev); |
1095 | goto ERROR4; | 1095 | goto ERROR4; |
1096 | } | 1096 | } |
1097 | 1097 | ||
@@ -1113,7 +1113,7 @@ static int __devexit it87_remove(struct platform_device *pdev) | |||
1113 | { | 1113 | { |
1114 | struct it87_data *data = platform_get_drvdata(pdev); | 1114 | struct it87_data *data = platform_get_drvdata(pdev); |
1115 | 1115 | ||
1116 | hwmon_device_unregister(data->class_dev); | 1116 | hwmon_device_unregister(data->hwmon_dev); |
1117 | sysfs_remove_group(&pdev->dev.kobj, &it87_group); | 1117 | sysfs_remove_group(&pdev->dev.kobj, &it87_group); |
1118 | sysfs_remove_group(&pdev->dev.kobj, &it87_group_opt); | 1118 | sysfs_remove_group(&pdev->dev.kobj, &it87_group_opt); |
1119 | 1119 | ||