From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0185C433E0 for ; Thu, 9 Jul 2020 10:36:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DAF00206DF for ; Thu, 9 Jul 2020 10:36:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726445AbgGIKgY (ORCPT ); Thu, 9 Jul 2020 06:36:24 -0400 Received: from foss.arm.com ([217.140.110.172]:49546 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726315AbgGIKgY (ORCPT ); Thu, 9 Jul 2020 06:36:24 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A4BA731B; Thu, 9 Jul 2020 03:36:23 -0700 (PDT) Received: from e121166-lin.cambridge.arm.com (e121166-lin.cambridge.arm.com [10.1.196.255]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 54F863F887; Thu, 9 Jul 2020 03:36:22 -0700 (PDT) Date: Thu, 9 Jul 2020 11:36:16 +0100 From: Lorenzo Pieralisi To: Dejin Zheng Cc: jingoohan1@gmail.com, robh@kernel.org, bhelgaas@google.com, kgene@kernel.org, krzk@kernel.org, thomas.petazzoni@bootlin.com, f.fainelli@gmail.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] PCI: controller: convert to devm_platform_ioremap_resource() Message-ID: <20200709103616.GA19492@e121166-lin.cambridge.arm.com> References: <20200526160110.31898-1-zhengdejin5@gmail.com> <20200708155614.308-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200708155614.308-1-zhengdejin5@gmail.com> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 08, 2020 at 11:56:14PM +0800, Dejin Zheng wrote: > use devm_platform_ioremap_resource() to simplify code, it > contains platform_get_resource() and devm_ioremap_resource(). > > Signed-off-by: Dejin Zheng > Reviewed-by: Rob Herring > --- > v1 -> v2: > - rebase to pci/misc branch > - add Rob Reviewed tag and Thanks for Bob's help. > > drivers/pci/controller/dwc/pci-exynos.c | 4 +--- > drivers/pci/controller/pci-aardvark.c | 5 ++--- > drivers/pci/controller/pci-ftpci100.c | 4 +--- > drivers/pci/controller/pci-versatile.c | 6 ++---- > drivers/pci/controller/pcie-brcmstb.c | 4 +--- > 5 files changed, 7 insertions(+), 16 deletions(-) Applied to pci/misc, thanks. Lorenzo > diff --git a/drivers/pci/controller/dwc/pci-exynos.c b/drivers/pci/controller/dwc/pci-exynos.c > index c5043d951e80..5791039d6a54 100644 > --- a/drivers/pci/controller/dwc/pci-exynos.c > +++ b/drivers/pci/controller/dwc/pci-exynos.c > @@ -84,14 +84,12 @@ static int exynos5440_pcie_get_mem_resources(struct platform_device *pdev, > { > struct dw_pcie *pci = ep->pci; > struct device *dev = pci->dev; > - struct resource *res; > > ep->mem_res = devm_kzalloc(dev, sizeof(*ep->mem_res), GFP_KERNEL); > if (!ep->mem_res) > return -ENOMEM; > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - ep->mem_res->elbi_base = devm_ioremap_resource(dev, res); > + ep->mem_res->elbi_base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(ep->mem_res->elbi_base)) > return PTR_ERR(ep->mem_res->elbi_base); > > diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c > index 90ff291c24f0..0d98f9b04daa 100644 > --- a/drivers/pci/controller/pci-aardvark.c > +++ b/drivers/pci/controller/pci-aardvark.c > @@ -1105,7 +1105,7 @@ static int advk_pcie_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct advk_pcie *pcie; > - struct resource *res, *bus; > + struct resource *bus; > struct pci_host_bridge *bridge; > int ret, irq; > > @@ -1116,8 +1116,7 @@ static int advk_pcie_probe(struct platform_device *pdev) > pcie = pci_host_bridge_priv(bridge); > pcie->pdev = pdev; > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - pcie->base = devm_ioremap_resource(dev, res); > + pcie->base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(pcie->base)) > return PTR_ERR(pcie->base); > > diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c > index 1b67564de7af..221dfc9dc81b 100644 > --- a/drivers/pci/controller/pci-ftpci100.c > +++ b/drivers/pci/controller/pci-ftpci100.c > @@ -422,7 +422,6 @@ static int faraday_pci_probe(struct platform_device *pdev) > struct device *dev = &pdev->dev; > const struct faraday_pci_variant *variant = > of_device_get_match_data(dev); > - struct resource *regs; > struct resource_entry *win; > struct faraday_pci *p; > struct resource *io; > @@ -465,8 +464,7 @@ static int faraday_pci_probe(struct platform_device *pdev) > return ret; > } > > - regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - p->base = devm_ioremap_resource(dev, regs); > + p->base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(p->base)) > return PTR_ERR(p->base); > > diff --git a/drivers/pci/controller/pci-versatile.c b/drivers/pci/controller/pci-versatile.c > index e90f0cc65c73..a8d361f6c5d9 100644 > --- a/drivers/pci/controller/pci-versatile.c > +++ b/drivers/pci/controller/pci-versatile.c > @@ -76,13 +76,11 @@ static int versatile_pci_probe(struct platform_device *pdev) > if (!bridge) > return -ENOMEM; > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - versatile_pci_base = devm_ioremap_resource(dev, res); > + versatile_pci_base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(versatile_pci_base)) > return PTR_ERR(versatile_pci_base); > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > - versatile_cfg_base[0] = devm_ioremap_resource(dev, res); > + versatile_cfg_base[0] = devm_platform_ioremap_resource(pdev, 1); > if (IS_ERR(versatile_cfg_base[0])) > return PTR_ERR(versatile_cfg_base[0]); > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 15c747c1390a..91a4b7f3ee45 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -933,7 +933,6 @@ static int brcm_pcie_probe(struct platform_device *pdev) > struct pci_host_bridge *bridge; > struct device_node *fw_np; > struct brcm_pcie *pcie; > - struct resource *res; > int ret; > > /* > @@ -958,8 +957,7 @@ static int brcm_pcie_probe(struct platform_device *pdev) > pcie->dev = &pdev->dev; > pcie->np = np; > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - pcie->base = devm_ioremap_resource(&pdev->dev, res); > + pcie->base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(pcie->base)) > return PTR_ERR(pcie->base); > > -- > 2.25.0 >