From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754009Ab3AaKfW (ORCPT ); Thu, 31 Jan 2013 05:35:22 -0500 Received: from mail-da0-f53.google.com ([209.85.210.53]:56133 "EHLO mail-da0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753719Ab3AaKe7 (ORCPT ); Thu, 31 Jan 2013 05:34:59 -0500 From: Sachin Kamat To: linux-kernel@vger.kernel.org Cc: thierry.reding@avionic-design.de, gregkh@linuxfoundation.org, sachin.kamat@linaro.org, Laxman Dewangan , linux-serial@vger.kernel.org Subject: [PATCH 3/3] serial: tegra: Convert to devm_ioremap_resource() Date: Thu, 31 Jan 2013 15:55:39 +0530 Message-Id: <1359627939-2685-3-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1359627939-2685-1-git-send-email-sachin.kamat@linaro.org> References: <1359627939-2685-1-git-send-email-sachin.kamat@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the newly introduced devm_ioremap_resource() instead of devm_request_and_ioremap() which provides more consistent error handling. Signed-off-by: Sachin Kamat Cc: Laxman Dewangan Cc: linux-serial@vger.kernel.org --- 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 #include #include +#include #include #include #include @@ -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