Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.
Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
Cc: Laxman Dewangan <ldewangan@xxxxxxxxxx>
Cc: linux-serial@xxxxxxxxxxxxxxx
---
Compile tested with linux-next (20130128).
---
drivers/tty/serial/serial-tegra.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c
index 4f5e629..80dfec1 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>
@@ -1302,10 +1303,10 @@ 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) {
+ u->membase = devm_ioremap_resource(&pdev->dev, resource);
+ if (IS_ERR(u->membase)) {
dev_err(&pdev->dev, "memregion/iomap address req failed\n");
- return -EADDRNOTAVAIL;
+ return PTR_ERR(u->membase);
}
tup->uart_clk = devm_clk_get(&pdev->dev, NULL);
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
