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/applesmc.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/applesmc.c')
-rw-r--r-- | drivers/hwmon/applesmc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index 941729a131f5..21ff8e126889 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c | |||
@@ -127,7 +127,7 @@ static s16 rest_x; | |||
127 | static s16 rest_y; | 127 | static s16 rest_y; |
128 | static struct timer_list applesmc_timer; | 128 | static struct timer_list applesmc_timer; |
129 | static struct input_dev *applesmc_idev; | 129 | static struct input_dev *applesmc_idev; |
130 | static struct class_device *hwmon_class_dev; | 130 | static struct device *hwmon_dev; |
131 | 131 | ||
132 | /* Indicates whether this computer has an accelerometer. */ | 132 | /* Indicates whether this computer has an accelerometer. */ |
133 | static unsigned int applesmc_accelerometer; | 133 | static unsigned int applesmc_accelerometer; |
@@ -1287,9 +1287,9 @@ static int __init applesmc_init(void) | |||
1287 | goto out_light_wq; | 1287 | goto out_light_wq; |
1288 | } | 1288 | } |
1289 | 1289 | ||
1290 | hwmon_class_dev = hwmon_device_register(&pdev->dev); | 1290 | hwmon_dev = hwmon_device_register(&pdev->dev); |
1291 | if (IS_ERR(hwmon_class_dev)) { | 1291 | if (IS_ERR(hwmon_dev)) { |
1292 | ret = PTR_ERR(hwmon_class_dev); | 1292 | ret = PTR_ERR(hwmon_dev); |
1293 | goto out_light_ledclass; | 1293 | goto out_light_ledclass; |
1294 | } | 1294 | } |
1295 | 1295 | ||
@@ -1331,7 +1331,7 @@ out: | |||
1331 | 1331 | ||
1332 | static void __exit applesmc_exit(void) | 1332 | static void __exit applesmc_exit(void) |
1333 | { | 1333 | { |
1334 | hwmon_device_unregister(hwmon_class_dev); | 1334 | hwmon_device_unregister(hwmon_dev); |
1335 | if (applesmc_light) { | 1335 | if (applesmc_light) { |
1336 | led_classdev_unregister(&applesmc_backlight); | 1336 | led_classdev_unregister(&applesmc_backlight); |
1337 | destroy_workqueue(applesmc_led_wq); | 1337 | destroy_workqueue(applesmc_led_wq); |