Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[karo-tx-linux.git] / drivers / gpio / gpio-janz-ttl.c

diff --git a/drivers/gpio/gpio-janz-ttl.c b/drivers/gpio/gpio-janz-ttl.c
index 813ac077e5d7d5b0d25e465c53dcb10a023ef595..f2f000dd70b369423517ace20da9ae57cc0d3600 100644 (file)
--- a/drivers/gpio/gpio-janz-ttl.c
+++ b/drivers/gpio/gpio-janz-ttl.c
@@ -201,8 +201,6 @@ static int __devinit ttl_probe(struct platform_device *pdev)
                goto out_iounmap_regs;
        }
 
-       dev_info(&pdev->dev, "module %d: registered GPIO device\n",
-                            pdata->modno);
        return 0;
 
 out_iounmap_regs:
@@ -239,20 +237,9 @@ static struct platform_driver ttl_driver = {
        .remove         = __devexit_p(ttl_remove),
 };
 
-static int __init ttl_init(void)
-{
-       return platform_driver_register(&ttl_driver);
-}
-
-static void __exit ttl_exit(void)
-{
-       platform_driver_unregister(&ttl_driver);
-}
+module_platform_driver(ttl_driver);
 
 MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");
 MODULE_DESCRIPTION("Janz MODULbus VMOD-TTL Driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:janz-ttl");
-
-module_init(ttl_init);
-module_exit(ttl_exit);