aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-09-30 00:42:51 -0400
committerWim Van Sebroeck <wim@iguana.be>2013-11-17 13:37:11 -0500
commit85eee81922399ec0be1b2c870f9333b4bca56650 (patch)
tree05f4f2d7fcc5f7f028fcc2fe154a8c875e2168a9 /drivers/watchdog
parenta20a99fbb88ac58c2e118e8759967d1cd7355322 (diff)
watchdog: Remove redundant of_match_ptr
of_match_ptr() is a macro used to avoid undefined reference error if CONFIG_OF is used to selectively compile in or out the data structure. It is defined as follows: #ifdef CONFIG_OF #define of_match_ptr(ptr) ptr #else #define of_match_ptr(ptr) NULL #endif In the case of this series, none of the drivers use CONFIG_OF macro to compile out the data structure (i.e., the data structure is always defined). Hence the use of of_match_ptr() does not make any sense. Thus removing it to make the code look simpler for readability. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Acked-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/at91rm9200_wdt.c2
-rw-r--r--drivers/watchdog/orion_wdt.c2
-rw-r--r--drivers/watchdog/sunxi_wdt.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 1c75260b987c..aa5cb56cf68a 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -269,7 +269,7 @@ static struct platform_driver at91wdt_driver = {
269 .driver = { 269 .driver = {
270 .name = "at91_wdt", 270 .name = "at91_wdt",
271 .owner = THIS_MODULE, 271 .owner = THIS_MODULE,
272 .of_match_table = of_match_ptr(at91_wdt_dt_ids), 272 .of_match_table = at91_wdt_dt_ids,
273 }, 273 },
274}; 274};
275 275
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 4ea5fcccac02..34adb540d02c 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -207,7 +207,7 @@ static struct platform_driver orion_wdt_driver = {
207 .driver = { 207 .driver = {
208 .owner = THIS_MODULE, 208 .owner = THIS_MODULE,
209 .name = "orion_wdt", 209 .name = "orion_wdt",
210 .of_match_table = of_match_ptr(orion_wdt_of_match_table), 210 .of_match_table = orion_wdt_of_match_table,
211 }, 211 },
212}; 212};
213 213
diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
index f6caa77151c7..76332d893e12 100644
--- a/drivers/watchdog/sunxi_wdt.c
+++ b/drivers/watchdog/sunxi_wdt.c
@@ -217,7 +217,7 @@ static struct platform_driver sunxi_wdt_driver = {
217 .driver = { 217 .driver = {
218 .owner = THIS_MODULE, 218 .owner = THIS_MODULE,
219 .name = DRV_NAME, 219 .name = DRV_NAME,
220 .of_match_table = of_match_ptr(sunxi_wdt_dt_ids) 220 .of_match_table = sunxi_wdt_dt_ids,
221 }, 221 },
222}; 222};
223 223