Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200528161510.31935-1-zhengdejin5@gmail.com> <CAMuHMdWXf-AB4ZKHkvpEKwTVj-qjV9TDk67QV2F+8X8dU8X5rA@mail.gmail.com>
In-Reply-To: <CAMuHMdWXf-AB4ZKHkvpEKwTVj-qjV9TDk67QV2F+8X8dU8X5rA@mail.gmail.com>
From:   Rob Herring <robh@kernel.org>
Date:   Thu, 12 Nov 2020 10:37:17 -0600
Message-ID: <CAL_JsqLYGFP1zLH539=agLsJ6kmSMD4HCKs_p3U7ZZhhZcQ_xA@mail.gmail.com>
Subject: Re: [PATCH v1] PCI: dwc: convert to devm_platform_ioremap_resource_byname()
To:     Geert Uytterhoeven <geert@linux-m68k.org>
Cc:     Dejin Zheng <zhengdejin5@gmail.com>,
        Kishon Vijay Abraham I <kishon@ti.com>,
        Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
        Bjorn Helgaas <bhelgaas@google.com>,
        Gustavo Pimentel <gustavo.pimentel@synopsys.com>,
        Shawn Guo <shawn.guo@linaro.org>,
        Andy Gross <agross@kernel.org>,
        linux-pci <linux-pci@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Thu, Nov 12, 2020 at 8:22 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> Hi Dejin,
>
> On Thu, May 28, 2020 at 6:18 PM Dejin Zheng <zhengdejin5@gmail.com> 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 <zhengdejin5@gmail.com>
>
> Thanks for your patch, which is now commit 936fa5cd7b8e3e2a ("PCI: dwc:
> Convert to devm_platform_ioremap_resource_byname()") in v5.9.

This is all changing again in my latest cleanups[1].

> > --- a/drivers/pci/controller/dwc/pci-dra7xx.c
> > +++ b/drivers/pci/controller/dwc/pci-dra7xx.c
> > @@ -593,13 +593,12 @@ static int __init dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx,
> >         ep = &pci->ep;
> >         ep->ops = &pcie_ep_ops;
> >
> > -       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ep_dbics");
> > -       pci->dbi_base = devm_ioremap_resource(dev, res);
> > +       pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "ep_dbics");
> >         if (IS_ERR(pci->dbi_base))
> >                 return PTR_ERR(pci->dbi_base);
> >
> > -       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ep_dbics2");
> > -       pci->dbi_base2 = devm_ioremap_resource(dev, res);
> > +       pci->dbi_base2 =
> > +               devm_platform_ioremap_resource_byname(pdev, "ep_dbics2");
> >         if (IS_ERR(pci->dbi_base2))
> >                 return PTR_ERR(pci->dbi_base2);
>
> The part above looks fine.
>
> > @@ -626,7 +625,6 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
> >         struct dw_pcie *pci = dra7xx->pci;
> >         struct pcie_port *pp = &pci->pp;
> >         struct device *dev = pci->dev;
> > -       struct resource *res;
> >
> >         pp->irq = platform_get_irq(pdev, 1);
> >         if (pp->irq < 0) {
> > @@ -638,8 +636,7 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
> >         if (ret < 0)
> >                 return ret;
> >
> > -       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbics");
> > -       pci->dbi_base = devm_ioremap_resource(dev, res);
> > +       pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "rc_dbics");
>
> Are you sure this is equivalent?
> Before, devm_ioremap_resource() was called on "dev" (= pci->dev),
> after it is called on "&pdev->dev" .

pci->dev is set to &pdev->dev in probe, so yes it's equivalent.

Rob

[1] https://lore.kernel.org/linux-pci/20201105211159.1814485-4-robh@kernel.org/