Messages in this thread | | | From | Geert Uytterhoeven <> | Date | Thu, 12 Nov 2020 15:22:33 +0100 | Subject | Re: [PATCH v1] PCI: dwc: convert to devm_platform_ioremap_resource_byname() |
| |
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.
> --- 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" .
> --- a/drivers/pci/controller/dwc/pcie-intel-gw.c > +++ b/drivers/pci/controller/dwc/pcie-intel-gw.c > @@ -253,11 +253,9 @@ static int intel_pcie_get_resources(struct platform_device *pdev) > struct intel_pcie_port *lpp = platform_get_drvdata(pdev); > struct dw_pcie *pci = &lpp->pci; > struct device *dev = pci->dev; > - struct resource *res; > int ret; > > - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi"); > - pci->dbi_base = devm_ioremap_resource(dev, res); > + pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "dbi");
Same issue here...
> if (IS_ERR(pci->dbi_base)) > return PTR_ERR(pci->dbi_base); > > @@ -291,8 +289,7 @@ static int intel_pcie_get_resources(struct platform_device *pdev) > ret = of_pci_get_max_link_speed(dev->of_node); > lpp->link_gen = ret < 0 ? 0 : ret; > > - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "app"); > - lpp->app_base = devm_ioremap_resource(dev, res); > + lpp->app_base = devm_platform_ioremap_resource_byname(pdev, "app"); > if (IS_ERR(lpp->app_base)) > return PTR_ERR(lpp->app_base);
... and here.
Gr{oetje,eeting}s,
Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
| |