summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-01-07 09:50:42 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-15 21:57:44 -0800
commit905f4ba252f933344e43a32ef4524bc8412c2e90 (patch)
tree136ed585450bf83ec09f218a8e57a067a3b124d8
parent41147bfdc5c0d6acb39d2b3b8a4eb6ffb08e4b42 (diff)
downloadlinux-stable-905f4ba252f933344e43a32ef4524bc8412c2e90.tar.gz
linux-stable-905f4ba252f933344e43a32ef4524bc8412c2e90.tar.bz2
linux-stable-905f4ba252f933344e43a32ef4524bc8412c2e90.zip
serial: Samsung: Use of_match_ptr() macro
This eliminates having an #ifdef returning NULL for the case when OF is disabled. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/samsung.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 96ae08f34770..0684529eb2ad 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1729,8 +1729,6 @@ static const struct of_device_id s3c24xx_uart_dt_match[] = {
{},
};
MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match);
-#else
-#define s3c24xx_uart_dt_match NULL
#endif
static struct platform_driver samsung_serial_driver = {
@@ -1741,7 +1739,7 @@ static struct platform_driver samsung_serial_driver = {
.name = "samsung-uart",
.owner = THIS_MODULE,
.pm = SERIAL_SAMSUNG_PM_OPS,
- .of_match_table = s3c24xx_uart_dt_match,
+ .of_match_table = of_match_ptr(s3c24xx_uart_dt_match),
},
};