1 files changed, 15 insertions, 4 deletions

diff --git a/drivers/char/hw_random/timeriomem-rng.c b/drivers/char/hw_random/timeriomem-rng.c
index 849db199c02..a8428e6f64a 100644
--- a/drivers/char/hw_random/timeriomem-rng.c
+++ b/drivers/char/hw_random/timeriomem-rng.c
@@ -88,7 +88,7 @@ static struct hwrng timeriomem_rng_ops = {
         .priv           = 0,
 };
 
-static int timeriomem_rng_probe(struct platform_device *pdev)
+static int __devinit timeriomem_rng_probe(struct platform_device *pdev)
 {
         struct resource *res;
         int ret;
@@ -130,7 +130,7 @@ failed:
         return ret;
 }
 
-static int timeriomem_rng_remove(struct platform_device *pdev)
+static int __devexit timeriomem_rng_remove(struct platform_device *pdev)
 {
         del_timer_sync(&timeriomem_rng_timer);
         hwrng_unregister(&timeriomem_rng_ops);
@@ -146,10 +146,21 @@ static struct platform_driver timeriomem_rng_driver = {
                 .owner          = THIS_MODULE,
         },
         .probe          = timeriomem_rng_probe,
-        .remove         = timeriomem_rng_remove,
+        .remove         = __devexit_p(timeriomem_rng_remove),
 };
 
-module_platform_driver(timeriomem_rng_driver);
+static int __init timeriomem_rng_init(void)
+{
+        return platform_driver_register(&timeriomem_rng_driver);
+}
+
+static void __exit timeriomem_rng_exit(void)
+{
+        platform_driver_unregister(&timeriomem_rng_driver);
+}
+
+module_init(timeriomem_rng_init);
+module_exit(timeriomem_rng_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Alexander Clouter <alex@digriz.org.uk>");