diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-03-04 09:59:00 +0530 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-15 13:55:22 -0700 |
commit | 84e819220468e989a0dde33bf1121888c5e749b1 (patch) | |
tree | 65d023d1e1b0715cd243a58fc78135503cac3549 /drivers/tty/serial/serial-tegra.c | |
parent | 19ffd68f816878aed456d5e87697f43bd9e3bd2b (diff) | |
download | linux-84e819220468e989a0dde33bf1121888c5e749b1.tar.bz2 |
serial: tegra: Convert to devm_ioremap_resource()
Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.
devm_ioremap_resource() provides its own error messages; so all explicit
error messages can be removed from the failure code paths.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Laxman Dewangan <ldewangan@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.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c index 372de8ade76a..9799d043a9bd 100644 --- 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)) { |