summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/serial-tegra.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-02-15 15:04:45 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-15 14:47:04 -0800
commitc3e1becebfe115f827ea2242218c9a8f627c094f (patch)
treeb1b45809c8fbd46e8ce49efaabe18933bfff53df /drivers/tty/serial/serial-tegra.c
parentb0de59b5733d18b0d1974a060860a8b5c1b36a2e (diff)
serial: tegra: assume CONFIG_OF
Tegra only supports, and always enables, device tree. Remove all ifdefs for DT support from the driver. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/serial-tegra.c')
-rw-r--r--drivers/tty/serial/serial-tegra.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c
index 4f5e62989a2..372de8ade76 100644
--- a/drivers/tty/serial/serial-tegra.c
+++ b/drivers/tty/serial/serial-tegra.c
@@ -1269,8 +1269,7 @@ static int tegra_uart_probe(struct platform_device *pdev)
const struct tegra_uart_chip_data *cdata;
const struct of_device_id *match;
- match = of_match_device(of_match_ptr(tegra_uart_of_match),
- &pdev->dev);
+ match = of_match_device(tegra_uart_of_match, &pdev->dev);
if (!match) {
dev_err(&pdev->dev, "Error: No device match found\n");
return -ENODEV;
@@ -1361,7 +1360,7 @@ static struct platform_driver tegra_uart_platform_driver = {
.remove = tegra_uart_remove,
.driver = {
.name = "serial-tegra",
- .of_match_table = of_match_ptr(tegra_uart_of_match),
+ .of_match_table = tegra_uart_of_match,
.pm = &tegra_uart_pm_ops,
},
};