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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 C2BEEC433E1 for ; Mon, 1 Jun 2020 22:22:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 99D4020825 for ; Mon, 1 Jun 2020 22:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591050154; bh=+nCixLKy+ieeptvXd0hOFM3Is0C3IYWj0WsTUa0UA/E=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=JykPKciPQIISbJ5+LeIufl0Ys/bDyaeymWyXfnKdHEFjAHCUDDW7ui1kA+d5hGFVM 5VYjLOBRueByp+1FQD+RHvcrXtAfTOs7W+hV31jwq1TMBzSixCYgsNB8KJWwUbNmzj G2F2OK1QPpby3pW7JNs3S+htaluJ6MZAwI6gHGco= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728811AbgFAWWe (ORCPT ); Mon, 1 Jun 2020 18:22:34 -0400 Received: from mail-il1-f193.google.com ([209.85.166.193]:36136 "EHLO mail-il1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728325AbgFAWWd (ORCPT ); Mon, 1 Jun 2020 18:22:33 -0400 Received: by mail-il1-f193.google.com with SMTP id a13so6197017ilh.3; Mon, 01 Jun 2020 15:22:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Px6uhJqavf/7SeXRRa1HZ/96uP551cj//kFm+GITnWs=; b=YMOD57/tugXpzOhuWbDCMYixXywj0ETOgHF/jJ2tAWlV22FSOhx1tlswcMdyQU7ls2 BIfrdPCHsK4AYfF69EA1G65BVANano/t4xUU/4vPa6oaLBtRJhmlDrs+MnL2uW8gUJiy 6hOghh4yl020HIp+69eEce00PdWph+eUmKE0VHz2RIwsiMSfjzNbWGJyeFBKdvZUP/b7 CR+M8rmE04ZitEVqwFtVjggTFgzenjRqqhuW2Z2Gq6OHZNbzP+lJKvC7YxER1W67FRm9 w360zHo46bA9bGHwgwwltNey+6/yzbSBLLayYdF5NpiTlUJr1KcFnTMByBi8NosTQ1L8 WkZA== X-Gm-Message-State: AOAM533wZFeOzwMnd+TAMaUneL4jH/frkOTZ8DwmCKEHvP8JzdwC/LXw /TWCTUTlsmQ4RDp39IWA6g== X-Google-Smtp-Source: ABdhPJziizHmLkCaiEctwEiw2oyXj/GJF/CgNAyw5URC4I4WpfRrISfBia1Zil9WjZ3szKSAzhhW5A== X-Received: by 2002:a92:c5c5:: with SMTP id s5mr12272687ilt.85.1591050151551; Mon, 01 Jun 2020 15:22:31 -0700 (PDT) Received: from xps15 ([64.188.179.251]) by smtp.gmail.com with ESMTPSA id n1sm434413ilm.55.2020.06.01.15.22.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 15:22:30 -0700 (PDT) Received: (nullmailer pid 1618077 invoked by uid 1000); Mon, 01 Jun 2020 22:22:29 -0000 Date: Mon, 1 Jun 2020 16:22:29 -0600 From: Rob Herring To: Dejin Zheng Cc: tjoseph@cadence.com, lorenzo.pieralisi@arm.com, bhelgaas@google.com, thierry.reding@gmail.com, toan@os.amperecomputing.com, ley.foon.tan@intel.com, shawn.lin@rock-chips.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v1] PCI: controller: convert to devm_platform_ioremap_resource_byname() Message-ID: <20200601222229.GA1613213@bogus> References: <20200601143345.24965-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200601143345.24965-1-zhengdejin5@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 01, 2020 at 10:33:45PM +0800, Dejin Zheng wrote: > Use devm_platform_ioremap_resource_byname() to simplify codes. > it contains platform_get_resource_byname() and devm_ioremap_resource(). > > Signed-off-by: Dejin Zheng > --- > drivers/pci/controller/cadence/pcie-cadence-ep.c | 3 +-- > drivers/pci/controller/cadence/pcie-cadence-host.c | 3 +-- > drivers/pci/controller/pci-tegra.c | 8 +++----- > drivers/pci/controller/pci-xgene.c | 3 +-- > drivers/pci/controller/pcie-altera-msi.c | 3 +-- > drivers/pci/controller/pcie-altera.c | 9 +++------ > drivers/pci/controller/pcie-mediatek.c | 4 +--- > drivers/pci/controller/pcie-rockchip.c | 5 ++--- > drivers/pci/controller/pcie-xilinx-nwl.c | 7 +++---- > 9 files changed, 16 insertions(+), 29 deletions(-) > > diff --git a/drivers/pci/controller/cadence/pcie-cadence-ep.c b/drivers/pci/controller/cadence/pcie-cadence-ep.c > index 1c15c8352125..74ffa03fde5f 100644 > --- a/drivers/pci/controller/cadence/pcie-cadence-ep.c > +++ b/drivers/pci/controller/cadence/pcie-cadence-ep.c > @@ -408,8 +408,7 @@ int cdns_pcie_ep_setup(struct cdns_pcie_ep *ep) > > pcie->is_rc = false; > > - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "reg"); > - pcie->reg_base = devm_ioremap_resource(dev, res); > + pcie->reg_base = devm_platform_ioremap_resource_byname(pdev, "reg"); > if (IS_ERR(pcie->reg_base)) { > dev_err(dev, "missing \"reg\"\n"); > return PTR_ERR(pcie->reg_base); > diff --git a/drivers/pci/controller/cadence/pcie-cadence-host.c b/drivers/pci/controller/cadence/pcie-cadence-host.c > index 8c2543f28ba0..dcc460a54875 100644 > --- a/drivers/pci/controller/cadence/pcie-cadence-host.c > +++ b/drivers/pci/controller/cadence/pcie-cadence-host.c > @@ -225,8 +225,7 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) > rc->device_id = 0xffff; > of_property_read_u32(np, "device-id", &rc->device_id); > > - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "reg"); > - pcie->reg_base = devm_ioremap_resource(dev, res); > + pcie->reg_base = devm_platform_ioremap_resource_byname(pdev, "reg"); > if (IS_ERR(pcie->reg_base)) { > dev_err(dev, "missing \"reg\"\n"); > return PTR_ERR(pcie->reg_base); > diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c > index e3e917243e10..3e608383df66 100644 > --- a/drivers/pci/controller/pci-tegra.c > +++ b/drivers/pci/controller/pci-tegra.c > @@ -1462,7 +1462,7 @@ static int tegra_pcie_get_resources(struct tegra_pcie *pcie) > { > struct device *dev = pcie->dev; > struct platform_device *pdev = to_platform_device(dev); > - struct resource *pads, *afi, *res; > + struct resource *res; > const struct tegra_pcie_soc *soc = pcie->soc; > int err; > > @@ -1486,15 +1486,13 @@ static int tegra_pcie_get_resources(struct tegra_pcie *pcie) > } > } > > - pads = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pads"); > - pcie->pads = devm_ioremap_resource(dev, pads); > + pcie->pads = devm_platform_ioremap_resource_byname(pdev, "pads"); > if (IS_ERR(pcie->pads)) { > err = PTR_ERR(pcie->pads); > goto phys_put; > } > > - afi = platform_get_resource_byname(pdev, IORESOURCE_MEM, "afi"); > - pcie->afi = devm_ioremap_resource(dev, afi); > + pcie->afi = devm_platform_ioremap_resource_byname(pdev, "afi"); > if (IS_ERR(pcie->afi)) { > err = PTR_ERR(pcie->afi); > goto phys_put; > diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c > index d1efa8ffbae1..1431a18eb02c 100644 > --- a/drivers/pci/controller/pci-xgene.c > +++ b/drivers/pci/controller/pci-xgene.c > @@ -355,8 +355,7 @@ static int xgene_pcie_map_reg(struct xgene_pcie_port *port, > if (IS_ERR(port->csr_base)) > return PTR_ERR(port->csr_base); > > - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg"); > - port->cfg_base = devm_ioremap_resource(dev, res); > + port->cfg_base = devm_platform_ioremap_resource_byname(pdev, "cfg"); > if (IS_ERR(port->cfg_base)) > return PTR_ERR(port->cfg_base); > port->cfg_addr = res->start; > diff --git a/drivers/pci/controller/pcie-altera-msi.c b/drivers/pci/controller/pcie-altera-msi.c > index 16d938920ca5..613e19af71bd 100644 > --- a/drivers/pci/controller/pcie-altera-msi.c > +++ b/drivers/pci/controller/pcie-altera-msi.c > @@ -228,8 +228,7 @@ static int altera_msi_probe(struct platform_device *pdev) > mutex_init(&msi->lock); > msi->pdev = pdev; > > - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "csr"); > - msi->csr_base = devm_ioremap_resource(&pdev->dev, res); > + msi->csr_base = devm_platform_ioremap_resource_byname(pdev, "csr"); > if (IS_ERR(msi->csr_base)) { > dev_err(&pdev->dev, "failed to map csr memory\n"); > return PTR_ERR(msi->csr_base); > diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c > index 24cb1c331058..7200e40ffa26 100644 > --- a/drivers/pci/controller/pcie-altera.c > +++ b/drivers/pci/controller/pcie-altera.c > @@ -696,17 +696,14 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) > { > struct device *dev = &pcie->pdev->dev; > struct platform_device *pdev = pcie->pdev; > - struct resource *cra; > - struct resource *hip; > > - cra = platform_get_resource_byname(pdev, IORESOURCE_MEM, "Cra"); > - pcie->cra_base = devm_ioremap_resource(dev, cra); > + pcie->cra_base = devm_platform_ioremap_resource_byname(pdev, "Cra"); > if (IS_ERR(pcie->cra_base)) > return PTR_ERR(pcie->cra_base); > > if (pcie->pcie_data->version == ALTERA_PCIE_V2) { > - hip = platform_get_resource_byname(pdev, IORESOURCE_MEM, "Hip"); > - pcie->hip_base = devm_ioremap_resource(&pdev->dev, hip); > + pcie->hip_base = > + devm_platform_ioremap_resource_byname(pdev, "Hip"); > if (IS_ERR(pcie->hip_base)) > return PTR_ERR(pcie->hip_base); > } > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c > index ebfa7d5a4e2d..d8e38276dbe3 100644 > --- a/drivers/pci/controller/pcie-mediatek.c > +++ b/drivers/pci/controller/pcie-mediatek.c > @@ -905,7 +905,6 @@ static int mtk_pcie_parse_port(struct mtk_pcie *pcie, > int slot) > { > struct mtk_pcie_port *port; > - struct resource *regs; > struct device *dev = pcie->dev; > struct platform_device *pdev = to_platform_device(dev); > char name[10]; > @@ -916,8 +915,7 @@ static int mtk_pcie_parse_port(struct mtk_pcie *pcie, > return -ENOMEM; > > snprintf(name, sizeof(name), "port%d", slot); > - regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, name); > - port->base = devm_ioremap_resource(dev, regs); > + port->base = devm_platform_ioremap_resource_byname(pdev, name); > if (IS_ERR(port->base)) { > dev_err(dev, "failed to map port%d base\n", slot); > return PTR_ERR(port->base); > diff --git a/drivers/pci/controller/pcie-rockchip.c b/drivers/pci/controller/pcie-rockchip.c > index c53d1322a3d6..904dec0d3a88 100644 > --- a/drivers/pci/controller/pcie-rockchip.c > +++ b/drivers/pci/controller/pcie-rockchip.c > @@ -45,9 +45,8 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) > return -EINVAL; > } > > - regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, > - "apb-base"); > - rockchip->apb_base = devm_ioremap_resource(dev, regs); > + rockchip->apb_base = > + devm_platform_ioremap_resource_byname(pdev, "apb-base"); > if (IS_ERR(rockchip->apb_base)) > return PTR_ERR(rockchip->apb_base); > > diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c > index 9bd1427f2fd6..06d5ca33d008 100644 > --- a/drivers/pci/controller/pcie-xilinx-nwl.c > +++ b/drivers/pci/controller/pcie-xilinx-nwl.c > @@ -777,14 +777,13 @@ static int nwl_pcie_parse_dt(struct nwl_pcie *pcie, > struct device *dev = pcie->dev; > struct resource *res; > > - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "breg"); > - pcie->breg_base = devm_ioremap_resource(dev, res); > + pcie->breg_base = devm_platform_ioremap_resource_byname(pdev, "breg"); > if (IS_ERR(pcie->breg_base)) > return PTR_ERR(pcie->breg_base); > pcie->phys_breg_base = res->start; > > - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcireg"); > - pcie->pcireg_base = devm_ioremap_resource(dev, res); > + pcie->pcireg_base = > + devm_platform_ioremap_resource_byname(pdev, "pcireg"); > if (IS_ERR(pcie->pcireg_base)) > return PTR_ERR(pcie->pcireg_base); > pcie->phys_pcie_reg_base = res->start; As 0-day pointed out, this hunk should be dropped as the phys address is needed. Rob