From 1ccfe51ab4d1ba16599a4f2712d0d83745becef3 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Tue, 3 Jul 2012 05:54:33 -0300
Subject: [PATCH] --- yaml --- r: 320158 b: refs/heads/master c:
 87e9429490dfe610faaf209795942272bc7a730a h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/video/s5p-jpeg/jpeg-core.c  | 24 +------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 72f8500eba80..d41e62ffc8a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91268a5e788c5bf246650c3a8c1a4626b9f0fe11
+refs/heads/master: 87e9429490dfe610faaf209795942272bc7a730a
diff --git a/trunk/drivers/media/video/s5p-jpeg/jpeg-core.c b/trunk/drivers/media/video/s5p-jpeg/jpeg-core.c
index 28b5225d94f5..e40e79b33df6 100644
--- a/trunk/drivers/media/video/s5p-jpeg/jpeg-core.c
+++ b/trunk/drivers/media/video/s5p-jpeg/jpeg-core.c
@@ -1503,29 +1503,7 @@ static struct platform_driver s5p_jpeg_driver = {
 	},
 };
 
-static int __init
-s5p_jpeg_register(void)
-{
-	int ret;
-
-	pr_info("S5P JPEG V4L2 Driver, (c) 2011 Samsung Electronics\n");
-
-	ret = platform_driver_register(&s5p_jpeg_driver);
-
-	if (ret)
-		pr_err("%s: failed to register jpeg driver\n", __func__);
-
-	return ret;
-}
-
-static void __exit
-s5p_jpeg_unregister(void)
-{
-	platform_driver_unregister(&s5p_jpeg_driver);
-}
-
-module_init(s5p_jpeg_register);
-module_exit(s5p_jpeg_unregister);
+module_platform_driver(s5p_jpeg_driver);
 
 MODULE_AUTHOR("Andrzej Pietrasiewicz <andrzej.p@samsung.com>");
 MODULE_DESCRIPTION("Samsung JPEG codec driver");