From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXtLo-00087X-Sq for linux-mtd@lists.infradead.org; Thu, 02 May 2013 13:15:09 +0000 Received: by mail-wi0-f181.google.com with SMTP id ey16so566143wid.2 for ; Thu, 02 May 2013 06:14:46 -0700 (PDT) From: Laurent Navet To: dwmw2@infradead.org Subject: [PATCH] drivers: mtd: nand: davinci: use devm_ioremap_resource() Date: Thu, 2 May 2013 15:22:14 +0200 Message-Id: <1367500934-28030-1-git-send-email-laurent.navet@gmail.com> Cc: mturquette@linaro.org, sshtylyov@ru.mvista.com, artem.bityutskiy@linux.intel.com, linux-kernel@vger.kernel.org, m-karicheri2@ti.com, linux-mtd@lists.infradead.org, Laurent Navet List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource. Found with coccicheck and this semantic patch: scripts/coccinelle/api/devm_request_and_ioremap.cocci. Signed-off-by: Laurent Navet --- drivers/mtd/nand/davinci_nand.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 94e17af..4a96e58 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -623,11 +623,14 @@ static int __init nand_davinci_probe(struct platform_device *pdev) goto err_nomem; } - vaddr = devm_request_and_ioremap(&pdev->dev, res1); - base = devm_request_and_ioremap(&pdev->dev, res2); - if (!vaddr || !base) { - dev_err(&pdev->dev, "ioremap failed\n"); - ret = -EADDRNOTAVAIL; + vaddr = devm_ioremap_resource(&pdev->dev, res1); + base = devm_ioremap_resource(&pdev->dev, res2); + if (IS_ERR(vaddr)) { + ret = PTR_ERR(vaddr); + goto err_ioremap; + } + if (IS_ERR(base)) { + ret = PTR_ERR(base); goto err_ioremap; } -- 1.7.10.4