Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / tty / serial / serial-tegra.c

diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c
index 372de8a..9799d04 100644 (file)
--- a/drivers/tty/serial/serial-tegra.c
+++ b/drivers/tty/serial/serial-tegra.c
@@ -26,6 +26,7 @@
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
+#include <linux/err.h>
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/module.h>
@@ -1301,11 +1302,9 @@ static int tegra_uart_probe(struct platform_device *pdev)
        }
 
        u->mapbase = resource->start;
-       u->membase = devm_request_and_ioremap(&pdev->dev, resource);
-       if (!u->membase) {
-               dev_err(&pdev->dev, "memregion/iomap address req failed\n");
-               return -EADDRNOTAVAIL;
-       }
+       u->membase = devm_ioremap_resource(&pdev->dev, resource);
+       if (IS_ERR(u->membase))
+               return PTR_ERR(u->membase);
 
        tup->uart_clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(tup->uart_clk)) {