diff options
Diffstat (limited to 'drivers/hwmon/hdaps.c')
-rw-r--r-- | drivers/hwmon/hdaps.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c index c8c84e0819fb..c81bd4bce1b8 100644 --- a/drivers/hwmon/hdaps.c +++ b/drivers/hwmon/hdaps.c | |||
@@ -286,7 +286,7 @@ out: | |||
286 | 286 | ||
287 | /* Device model stuff */ | 287 | /* Device model stuff */ |
288 | 288 | ||
289 | static int hdaps_probe(struct device *dev) | 289 | static int hdaps_probe(struct platform_device *dev) |
290 | { | 290 | { |
291 | int ret; | 291 | int ret; |
292 | 292 | ||
@@ -298,17 +298,18 @@ static int hdaps_probe(struct device *dev) | |||
298 | return 0; | 298 | return 0; |
299 | } | 299 | } |
300 | 300 | ||
301 | static int hdaps_resume(struct device *dev) | 301 | static int hdaps_resume(struct platform_device *dev) |
302 | { | 302 | { |
303 | return hdaps_device_init(); | 303 | return hdaps_device_init(); |
304 | } | 304 | } |
305 | 305 | ||
306 | static struct device_driver hdaps_driver = { | 306 | static struct platform_driver hdaps_driver = { |
307 | .name = "hdaps", | ||
308 | .bus = &platform_bus_type, | ||
309 | .owner = THIS_MODULE, | ||
310 | .probe = hdaps_probe, | 307 | .probe = hdaps_probe, |
311 | .resume = hdaps_resume | 308 | .resume = hdaps_resume, |
309 | .driver = { | ||
310 | .name = "hdaps", | ||
311 | .owner = THIS_MODULE, | ||
312 | }, | ||
312 | }; | 313 | }; |
313 | 314 | ||
314 | /* | 315 | /* |
@@ -540,7 +541,7 @@ static int __init hdaps_init(void) | |||
540 | goto out; | 541 | goto out; |
541 | } | 542 | } |
542 | 543 | ||
543 | ret = driver_register(&hdaps_driver); | 544 | ret = platform_driver_register(&hdaps_driver); |
544 | if (ret) | 545 | if (ret) |
545 | goto out_region; | 546 | goto out_region; |
546 | 547 | ||
@@ -588,7 +589,7 @@ out_group: | |||
588 | out_device: | 589 | out_device: |
589 | platform_device_unregister(pdev); | 590 | platform_device_unregister(pdev); |
590 | out_driver: | 591 | out_driver: |
591 | driver_unregister(&hdaps_driver); | 592 | platform_driver_unregister(&hdaps_driver); |
592 | out_region: | 593 | out_region: |
593 | release_region(HDAPS_LOW_PORT, HDAPS_NR_PORTS); | 594 | release_region(HDAPS_LOW_PORT, HDAPS_NR_PORTS); |
594 | out: | 595 | out: |
@@ -602,7 +603,7 @@ static void __exit hdaps_exit(void) | |||
602 | input_unregister_device(hdaps_idev); | 603 | input_unregister_device(hdaps_idev); |
603 | sysfs_remove_group(&pdev->dev.kobj, &hdaps_attribute_group); | 604 | sysfs_remove_group(&pdev->dev.kobj, &hdaps_attribute_group); |
604 | platform_device_unregister(pdev); | 605 | platform_device_unregister(pdev); |
605 | driver_unregister(&hdaps_driver); | 606 | platform_driver_unregister(&hdaps_driver); |
606 | release_region(HDAPS_LOW_PORT, HDAPS_NR_PORTS); | 607 | release_region(HDAPS_LOW_PORT, HDAPS_NR_PORTS); |
607 | 608 | ||
608 | printk(KERN_INFO "hdaps: driver unloaded.\n"); | 609 | printk(KERN_INFO "hdaps: driver unloaded.\n"); |