From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226wjsuX8n9MvBaO/MWhop5UjyMtb7grU0t8qB81hvZI961FlQWGUIuWQhvTD7M15MBLJDoj ARC-Seal: i=1; a=rsa-sha256; t=1516788511; cv=none; d=google.com; s=arc-20160816; b=xHGmrFd8Su2TKI2FjR62n4PfVUE7fNLwrowVmQkS9fgym2w/H6Y9L+3aB/wzIA9xfq toyB7acRJgHqJAwiQ6Dhrq6W1979Wb3akJNoAgaJcOVbv/x2GNCODCjUoJcPfO0kYFKR oQsAd8emybRpdVZIE6XjZzaXpH1x6dvYWhICGp5I9AOYmCrg0aseQk9m8PgkTvB0wYVr TnQnC7FAJtimUOYBrLWlX8aax5A7sbzmp6ng9gjOAcZuCVrz2nXS0HGyfmygfguN9CrK H2PAUk6gDFKDvnQG9okJuDPfftVLy8o59ga+GAppRCPQ0/zO6IBRLmUxS25R0BAx/2SO yCmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version:references :message-id:subject:cc:to:from:sender:date :arc-authentication-results; bh=2YnBJd8IbCYh/pK/ZYuhC2DnRSVMag4PGbWQlsXGZqY=; b=c9nbT29LKMzwFmvOx6pRsVdo03IS04Q8Q0WuFQUcMJp09p6tZHe4e+9No7OVZyzd3q vz/rX1M1nXK/z5JE00u3Rn9sF6btg8oRzWenGlZf2HSanduTvRhWOwMmMI0slIyVRSSH 68RTfEEuLRIwKoM0nYW7I8982GBJXuiGqQJ0YuhMPsQ5cXlTP0vC0xXMEth3MK5WN23l In77iHkv3apg2SNKjthEiCRjhd2Lwk/a2PjSedVvR27/6Uv/NN2ZsHxkbZMfEShsDZR7 ioY2z1an3TjlfVtNbhVgAPVzxvrC86Cvj+390mpU4qC73r04tb8nvK7mhkN6273Zell5 r3/Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of ladis@linux-mips.org designates 148.251.95.138 as permitted sender) smtp.mailfrom=ladis@linux-mips.org Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of ladis@linux-mips.org designates 148.251.95.138 as permitted sender) smtp.mailfrom=ladis@linux-mips.org Date: Wed, 24 Jan 2018 11:08:28 +0100 Sender: Ladislav Michl From: Ladislav Michl To: linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org Cc: Thomas Gleixner , Tom Lendacky , Borislav Petkov , Ingo Molnar , Lorenzo Pieralisi , Philippe Ombredanne , Kate Stewart , Greg Kroah-Hartman , Boris Brezillon , Dmitry Torokhov , Bjorn Helgaas , Wei Yongjun Subject: [PATCH v2 3/3] mtd: nand: davinci: Use devm_ioremap_shared_resource() Message-ID: <20180124100828.GD19593@lenoch> References: <20180124100604.GA19593@lenoch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180124100604.GA19593@lenoch> User-Agent: Mutt/1.9.2 (2017-12-15) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590468030596093667?= X-GMAIL-MSGID: =?utf-8?q?1590468030596093667?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Simplify error handling by using devm_ioremap_shared_resource(). Signed-off-by: Ladislav Michl --- Changes: - v2: None drivers/mtd/nand/davinci_nand.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index ccc8c43abcff..9b6f06b177b9 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -612,10 +612,8 @@ static int nand_davinci_probe(struct platform_device *pdev) { struct davinci_nand_pdata *pdata; struct davinci_nand_info *info; - struct resource *res1; - struct resource *res2; + struct resource *res; void __iomem *vaddr; - void __iomem *base; int ret; uint32_t val; struct mtd_info *mtd; @@ -638,14 +636,8 @@ static int nand_davinci_probe(struct platform_device *pdev) platform_set_drvdata(pdev, info); - res1 = platform_get_resource(pdev, IORESOURCE_MEM, 0); - res2 = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (!res1 || !res2) { - dev_err(&pdev->dev, "resource missing\n"); - return -EINVAL; - } - - vaddr = devm_ioremap_resource(&pdev->dev, res1); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + vaddr = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(vaddr)) return PTR_ERR(vaddr); @@ -655,14 +647,12 @@ static int nand_davinci_probe(struct platform_device *pdev) * by AEMIF, so we cannot request it twice, just ioremap. * The AEMIF and NAND drivers not use the same registers in this range. */ - base = devm_ioremap(&pdev->dev, res2->start, resource_size(res2)); - if (!base) { - dev_err(&pdev->dev, "ioremap failed for resource %pR\n", res2); - return -EADDRNOTAVAIL; - } + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + info->base = devm_ioremap_shared_resource(&pdev->dev, res); + if (IS_ERR(info->base)) + return PTR_ERR(info->base); info->dev = &pdev->dev; - info->base = base; info->vaddr = vaddr; mtd = nand_to_mtd(&info->chip); -- 2.15.1