From: Wim Van Sebroeck <wim@iguana.be>
Date: Thu, 3 May 2012 05:24:17 +0000 (+0000)
Subject: watchdog: s3c2410-wdt: Use of_match_ptr().
X-Git-Tag: v3.5-rc1~113^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3016a552a8314b2734aed0a1acbb983459e2acc4;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

watchdog: s3c2410-wdt: Use of_match_ptr().

Use of_match_ptr definition for the of_match_table.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com>
---

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 04e5a6d..d277cd6 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -40,6 +40,7 @@
 #include <linux/cpufreq.h>
 #include <linux/slab.h>
 #include <linux/err.h>
+#include <linux/of.h>
 
 #include <mach/map.h>
 
@@ -503,8 +504,6 @@ static const struct of_device_id s3c2410_wdt_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, s3c2410_wdt_match);
-#else
-#define s3c2410_wdt_match NULL
 #endif
 
 static struct platform_driver s3c2410wdt_driver = {
@@ -516,7 +515,7 @@ static struct platform_driver s3c2410wdt_driver = {
 	.driver		= {
 		.owner	= THIS_MODULE,
 		.name	= "s3c2410-wdt",
-		.of_match_table	= s3c2410_wdt_match,
+		.of_match_table	= of_match_ptr(s3c2410_wdt_match),
 	},
 };