Merge branch 'v4l_for_linus' into staging/for_v3.4

[firefly-linux-kernel-4.4.55.git] / drivers / input / touchscreen / jornada720_ts.c

diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c
index 50076c2d59e23467e2be9bd1da2f00b7d59db2b5..c3848ad2325bcbe48d6a244d374ffd08cc70d8a9 100644 (file)
--- a/drivers/input/touchscreen/jornada720_ts.c
+++ b/drivers/input/touchscreen/jornada720_ts.c
@@ -172,16 +172,4 @@ static struct platform_driver jornada720_ts_driver = {
                .owner  = THIS_MODULE,
        },
 };
-
-static int __init jornada720_ts_init(void)
-{
-       return platform_driver_register(&jornada720_ts_driver);
-}
-
-static void __exit jornada720_ts_exit(void)
-{
-       platform_driver_unregister(&jornada720_ts_driver);
-}
-
-module_init(jornada720_ts_init);
-module_exit(jornada720_ts_exit);
+module_platform_driver(jornada720_ts_driver);