Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[deliverable/linux.git] / arch / sh / drivers / heartbeat.c

diff --git a/arch/sh/drivers/heartbeat.c b/arch/sh/drivers/heartbeat.c
index 7efc9c354fc7e7847f00334d4687075c1416a26d..49bace446a1ab885be104c03946226e9ea44c4bc 100644 (file)
--- a/arch/sh/drivers/heartbeat.c
+++ b/arch/sh/drivers/heartbeat.c
@@ -19,7 +19,6 @@
  * for more details.
  */
 #include <linux/init.h>
-#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
 #include <linux/timer.h>
@@ -139,26 +138,11 @@ static int heartbeat_drv_probe(struct platform_device *pdev)
        return mod_timer(&hd->timer, jiffies + 1);
 }
 
-static int heartbeat_drv_remove(struct platform_device *pdev)
-{
-       struct heartbeat_data *hd = platform_get_drvdata(pdev);
-
-       del_timer_sync(&hd->timer);
-       iounmap(hd->base);
-
-       platform_set_drvdata(pdev, NULL);
-
-       if (!pdev->dev.platform_data)
-               kfree(hd);
-
-       return 0;
-}
-
 static struct platform_driver heartbeat_driver = {
        .probe          = heartbeat_drv_probe,
-       .remove         = heartbeat_drv_remove,
        .driver         = {
-               .name   = DRV_NAME,
+               .name                   = DRV_NAME,
+               .suppress_bind_attrs    = true,
        },
 };
 
@@ -167,14 +151,4 @@ static int __init heartbeat_init(void)
        printk(KERN_NOTICE DRV_NAME ": version %s loaded\n", DRV_VERSION);
        return platform_driver_register(&heartbeat_driver);
 }
-
-static void __exit heartbeat_exit(void)
-{
-       platform_driver_unregister(&heartbeat_driver);
-}
-module_init(heartbeat_init);
-module_exit(heartbeat_exit);
-
-MODULE_VERSION(DRV_VERSION);
-MODULE_AUTHOR("Paul Mundt");
-MODULE_LICENSE("GPL v2");
+device_initcall(heartbeat_init);