From patchwork Fri Oct 19 07:48:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 986599 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ie19ghOA"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42bylb3g9Qz9sBj for ; Fri, 19 Oct 2018 18:51:07 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ijgn4XCj5BjGXFnbXVV/GqacqOW/kA0dz+nRIfPpIPU=; b=Ie19ghOAX039b7Pmg6kK12u1tk oTFAAXTFjuMBLIhJCgAyQKBAvJYjRHlfFUzrOkUjs6yRAxliKy7TRR7AUWnwgsPXEw+88HbkLHHTf 9TQqxZfoCi1F1eul/u9InPtDJ1FedtF+foYzeiooG5PzSds2AyLGuAQXnzUCSa9MegzhhQ53AcES6 OOCl8ew3qbakZJqc230CpITGZ9nUN+dEl5II2dJiMRB+Ve381ayJwrpQWssglbyv2Ct9NByUpkVOH +v2TJYGGhN+1B0YucvEdexgGDMrnFSPv4OvwiNWRwsZ2F2QjhduOZ5EBHZDCdVOut5O+pcCBLBgS7 CSDxVUsg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gDPYd-0005Cl-Nm; Fri, 19 Oct 2018 07:50:55 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gDPXJ-0003Pf-2D for linux-mtd@lists.infradead.org; Fri, 19 Oct 2018 07:49:37 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id EE12B206D8; Fri, 19 Oct 2018 09:49:22 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.bootlin.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost.localdomain (91-160-177-164.subs.proxad.net [91.160.177.164]) by mail.bootlin.com (Postfix) with ESMTPSA id 8943820723; Fri, 19 Oct 2018 09:49:12 +0200 (CEST) From: Boris Brezillon To: David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , linux-mtd@lists.infradead.org Subject: [PATCH v2 03/15] mtd: maps: physmap: Use platform_get_resource() to retrieve iomem resources Date: Fri, 19 Oct 2018 09:48:56 +0200 Message-Id: <20181019074908.13226-4-boris.brezillon@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20181019074908.13226-1-boris.brezillon@bootlin.com> References: <20181019074908.13226-1-boris.brezillon@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181019_004933_436053_9683E39A X-CRM114-Status: GOOD ( 19.59 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Pawel Moll , Ian Campbell , Linus Walleij , Rob Herring , Kumar Gala , Ricardo Ribalda Delgado MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Stop manipulating the dev->resource array directly and use the platform_get_resource() helper instead. While at it, fix the loop check so that we never overflow the info->maps and info->mtds array even if the number of resources attached to the platform dev is higher than MAX_RESOURCES. Signed-off-by: Boris Brezillon Reviewed-by: Ricardo Ribalda Delgado --- Changes in v2: - Add Ricardo's R-b - Fix the platform_get_resource() ret code check --- drivers/mtd/maps/physmap.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 4010afee4a33..a097f0cf519a 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c @@ -122,23 +122,28 @@ static int physmap_flash_probe(struct platform_device *dev) platform_set_drvdata(dev, info); - for (i = 0; i < dev->num_resources; i++) { + for (i = 0; i < MAX_RESOURCES; i++) { + struct resource *res; + + res = platform_get_resource(dev, IORESOURCE_MEM, i); + if (!res) + break; + printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n", - (unsigned long long)resource_size(&dev->resource[i]), - (unsigned long long)dev->resource[i].start); + (unsigned long long)resource_size(res), + (unsigned long long)res->start); - if (!devm_request_mem_region(&dev->dev, - dev->resource[i].start, - resource_size(&dev->resource[i]), - dev_name(&dev->dev))) { + if (!devm_request_mem_region(&dev->dev, res->start, + resource_size(res), + dev_name(&dev->dev))) { dev_err(&dev->dev, "Could not reserve memory region\n"); err = -ENOMEM; goto err_out; } info->maps[i].name = dev_name(&dev->dev); - info->maps[i].phys = dev->resource[i].start; - info->maps[i].size = resource_size(&dev->resource[i]); + info->maps[i].phys = res->start; + info->maps[i].size = resource_size(res); info->maps[i].bankwidth = physmap_data->width; info->maps[i].set_vpp = physmap_set_vpp; info->maps[i].pfow_base = physmap_data->pfow_base; @@ -172,9 +177,11 @@ static int physmap_flash_probe(struct platform_device *dev) info->mtds[i]->dev.parent = &dev->dev; } - if (devices_found == 1) { + if (!devices_found) { + err = -ENODEV; + } else if (devices_found == 1) { info->cmtd = info->mtds[0]; - } else if (devices_found > 1) { + } else { /* * We detected multiple devices. Concatenate them together. */