aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-01-06 23:20:42 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-16 00:57:44 -0500
commit905f4ba252f933344e43a32ef4524bc8412c2e90 (patch)
tree136ed585450bf83ec09f218a8e57a067a3b124d8 /drivers/tty
parent41147bfdc5c0d6acb39d2b3b8a4eb6ffb08e4b42 (diff)
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>
Diffstat (limited to 'drivers/tty')
-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[] = {
1729 {}, 1729 {},
1730}; 1730};
1731MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match); 1731MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match);
1732#else
1733#define s3c24xx_uart_dt_match NULL
1734#endif 1732#endif
1735 1733
1736static struct platform_driver samsung_serial_driver = { 1734static struct platform_driver samsung_serial_driver = {
@@ -1741,7 +1739,7 @@ static struct platform_driver samsung_serial_driver = {
1741 .name = "samsung-uart", 1739 .name = "samsung-uart",
1742 .owner = THIS_MODULE, 1740 .owner = THIS_MODULE,
1743 .pm = SERIAL_SAMSUNG_PM_OPS, 1741 .pm = SERIAL_SAMSUNG_PM_OPS,
1744 .of_match_table = s3c24xx_uart_dt_match, 1742 .of_match_table = of_match_ptr(s3c24xx_uart_dt_match),
1745 }, 1743 },
1746}; 1744};
1747 1745