Skip to content

Commit 936fa5c

Browse files
Dejin ZhengLorenzo Pieralisi
Dejin Zheng
authored and
Lorenzo Pieralisi
committed
PCI: dwc: Convert to devm_platform_ioremap_resource_byname()
Use devm_platform_ioremap_resource_byname() to simplify the code since it contains platform_get_resource_byname() and devm_ioremap_resource() respectively. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dejin Zheng <[email protected]> Signed-off-by: Lorenzo Pieralisi <[email protected]> Reviewed-by: Gustavo Pimentel <[email protected]> Reviewed-by: Rob Herring <[email protected]>
1 parent 824001c commit 936fa5c

File tree

9 files changed

+23
-46
lines changed

9 files changed

+23
-46
lines changed

‎drivers/pci/controller/dwc/pci-dra7xx.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -593,13 +593,12 @@ static int __init dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx,
593593
ep = &pci->ep;
594594
ep->ops = &pcie_ep_ops;
595595

596-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ep_dbics");
597-
pci->dbi_base = devm_ioremap_resource(dev, res);
596+
pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "ep_dbics");
598597
if (IS_ERR(pci->dbi_base))
599598
return PTR_ERR(pci->dbi_base);
600599

601-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ep_dbics2");
602-
pci->dbi_base2 = devm_ioremap_resource(dev, res);
600+
pci->dbi_base2 =
601+
devm_platform_ioremap_resource_byname(pdev, "ep_dbics2");
603602
if (IS_ERR(pci->dbi_base2))
604603
return PTR_ERR(pci->dbi_base2);
605604

@@ -626,7 +625,6 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
626625
struct dw_pcie *pci = dra7xx->pci;
627626
struct pcie_port *pp = &pci->pp;
628627
struct device *dev = pci->dev;
629-
struct resource *res;
630628

631629
pp->irq = platform_get_irq(pdev, 1);
632630
if (pp->irq < 0) {
@@ -638,8 +636,7 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
638636
if (ret < 0)
639637
return ret;
640638

641-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbics");
642-
pci->dbi_base = devm_ioremap_resource(dev, res);
639+
pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "rc_dbics");
643640
if (IS_ERR(pci->dbi_base))
644641
return PTR_ERR(pci->dbi_base);
645642

‎drivers/pci/controller/dwc/pci-keystone.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,8 +1323,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
13231323
}
13241324

13251325
if (pci->version >= 0x480A) {
1326-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "atu");
1327-
atu_base = devm_ioremap_resource(dev, res);
1326+
atu_base = devm_platform_ioremap_resource_byname(pdev, "atu");
13281327
if (IS_ERR(atu_base)) {
13291328
ret = PTR_ERR(atu_base);
13301329
goto err_get_sync;

‎drivers/pci/controller/dwc/pcie-artpec6.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,7 @@ static int artpec6_add_pcie_ep(struct artpec6_pcie *artpec6_pcie,
455455
ep = &pci->ep;
456456
ep->ops = &pcie_ep_ops;
457457

458-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi2");
459-
pci->dbi_base2 = devm_ioremap_resource(dev, res);
458+
pci->dbi_base2 = devm_platform_ioremap_resource_byname(pdev, "dbi2");
460459
if (IS_ERR(pci->dbi_base2))
461460
return PTR_ERR(pci->dbi_base2);
462461

@@ -481,8 +480,6 @@ static int artpec6_pcie_probe(struct platform_device *pdev)
481480
struct device *dev = &pdev->dev;
482481
struct dw_pcie *pci;
483482
struct artpec6_pcie *artpec6_pcie;
484-
struct resource *dbi_base;
485-
struct resource *phy_base;
486483
int ret;
487484
const struct of_device_id *match;
488485
const struct artpec_pcie_of_data *data;
@@ -512,13 +509,12 @@ static int artpec6_pcie_probe(struct platform_device *pdev)
512509
artpec6_pcie->variant = variant;
513510
artpec6_pcie->mode = mode;
514511

515-
dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
516-
pci->dbi_base = devm_ioremap_resource(dev, dbi_base);
512+
pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "dbi");
517513
if (IS_ERR(pci->dbi_base))
518514
return PTR_ERR(pci->dbi_base);
519515

520-
phy_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
521-
artpec6_pcie->phy_base = devm_ioremap_resource(dev, phy_base);
516+
artpec6_pcie->phy_base =
517+
devm_platform_ioremap_resource_byname(pdev, "phy");
522518
if (IS_ERR(artpec6_pcie->phy_base))
523519
return PTR_ERR(artpec6_pcie->phy_base);
524520

‎drivers/pci/controller/dwc/pcie-designware-plat.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ static int dw_plat_add_pcie_ep(struct dw_plat_pcie *dw_plat_pcie,
153153
ep = &pci->ep;
154154
ep->ops = &pcie_ep_ops;
155155

156-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi2");
157-
pci->dbi_base2 = devm_ioremap_resource(dev, res);
156+
pci->dbi_base2 = devm_platform_ioremap_resource_byname(pdev, "dbi2");
158157
if (IS_ERR(pci->dbi_base2))
159158
return PTR_ERR(pci->dbi_base2);
160159

‎drivers/pci/controller/dwc/pcie-histb.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ static int histb_pcie_probe(struct platform_device *pdev)
304304
struct histb_pcie *hipcie;
305305
struct dw_pcie *pci;
306306
struct pcie_port *pp;
307-
struct resource *res;
308307
struct device_node *np = pdev->dev.of_node;
309308
struct device *dev = &pdev->dev;
310309
enum of_gpio_flags of_flags;
@@ -324,15 +323,13 @@ static int histb_pcie_probe(struct platform_device *pdev)
324323
pci->dev = dev;
325324
pci->ops = &dw_pcie_ops;
326325

327-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "control");
328-
hipcie->ctrl = devm_ioremap_resource(dev, res);
326+
hipcie->ctrl = devm_platform_ioremap_resource_byname(pdev, "control");
329327
if (IS_ERR(hipcie->ctrl)) {
330328
dev_err(dev, "cannot get control reg base\n");
331329
return PTR_ERR(hipcie->ctrl);
332330
}
333331

334-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc-dbi");
335-
pci->dbi_base = devm_ioremap_resource(dev, res);
332+
pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "rc-dbi");
336333
if (IS_ERR(pci->dbi_base)) {
337334
dev_err(dev, "cannot get rc-dbi base\n");
338335
return PTR_ERR(pci->dbi_base);

‎drivers/pci/controller/dwc/pcie-intel-gw.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,9 @@ static int intel_pcie_get_resources(struct platform_device *pdev)
253253
struct intel_pcie_port *lpp = platform_get_drvdata(pdev);
254254
struct dw_pcie *pci = &lpp->pci;
255255
struct device *dev = pci->dev;
256-
struct resource *res;
257256
int ret;
258257

259-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
260-
pci->dbi_base = devm_ioremap_resource(dev, res);
258+
pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "dbi");
261259
if (IS_ERR(pci->dbi_base))
262260
return PTR_ERR(pci->dbi_base);
263261

@@ -291,8 +289,7 @@ static int intel_pcie_get_resources(struct platform_device *pdev)
291289
ret = of_pci_get_max_link_speed(dev->of_node);
292290
lpp->link_gen = ret < 0 ? 0 : ret;
293291

294-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "app");
295-
lpp->app_base = devm_ioremap_resource(dev, res);
292+
lpp->app_base = devm_platform_ioremap_resource_byname(pdev, "app");
296293
if (IS_ERR(lpp->app_base))
297294
return PTR_ERR(lpp->app_base);
298295

‎drivers/pci/controller/dwc/pcie-kirin.c

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,23 +147,18 @@ static long kirin_pcie_get_clk(struct kirin_pcie *kirin_pcie,
147147
static long kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie,
148148
struct platform_device *pdev)
149149
{
150-
struct device *dev = &pdev->dev;
151-
struct resource *apb;
152-
struct resource *phy;
153-
struct resource *dbi;
154-
155-
apb = platform_get_resource_byname(pdev, IORESOURCE_MEM, "apb");
156-
kirin_pcie->apb_base = devm_ioremap_resource(dev, apb);
150+
kirin_pcie->apb_base =
151+
devm_platform_ioremap_resource_byname(pdev, "apb");
157152
if (IS_ERR(kirin_pcie->apb_base))
158153
return PTR_ERR(kirin_pcie->apb_base);
159154

160-
phy = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
161-
kirin_pcie->phy_base = devm_ioremap_resource(dev, phy);
155+
kirin_pcie->phy_base =
156+
devm_platform_ioremap_resource_byname(pdev, "phy");
162157
if (IS_ERR(kirin_pcie->phy_base))
163158
return PTR_ERR(kirin_pcie->phy_base);
164159

165-
dbi = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
166-
kirin_pcie->pci->dbi_base = devm_ioremap_resource(dev, dbi);
160+
kirin_pcie->pci->dbi_base =
161+
devm_platform_ioremap_resource_byname(pdev, "dbi");
167162
if (IS_ERR(kirin_pcie->pci->dbi_base))
168163
return PTR_ERR(kirin_pcie->pci->dbi_base);
169164

‎drivers/pci/controller/dwc/pcie-qcom.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,8 +1405,7 @@ static int qcom_pcie_probe(struct platform_device *pdev)
14051405
if (pcie->gen < 0)
14061406
pcie->gen = 2;
14071407

1408-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "parf");
1409-
pcie->parf = devm_ioremap_resource(dev, res);
1408+
pcie->parf = devm_platform_ioremap_resource_byname(pdev, "parf");
14101409
if (IS_ERR(pcie->parf)) {
14111410
ret = PTR_ERR(pcie->parf);
14121411
goto err_pm_runtime_put;
@@ -1419,8 +1418,7 @@ static int qcom_pcie_probe(struct platform_device *pdev)
14191418
goto err_pm_runtime_put;
14201419
}
14211420

1422-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "elbi");
1423-
pcie->elbi = devm_ioremap_resource(dev, res);
1421+
pcie->elbi = devm_platform_ioremap_resource_byname(pdev, "elbi");
14241422
if (IS_ERR(pcie->elbi)) {
14251423
ret = PTR_ERR(pcie->elbi);
14261424
goto err_pm_runtime_put;

‎drivers/pci/controller/dwc/pcie-uniphier.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,8 +416,7 @@ static int uniphier_pcie_probe(struct platform_device *pdev)
416416
if (IS_ERR(priv->pci.dbi_base))
417417
return PTR_ERR(priv->pci.dbi_base);
418418

419-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "link");
420-
priv->base = devm_ioremap_resource(dev, res);
419+
priv->base = devm_platform_ioremap_resource_byname(pdev, "link");
421420
if (IS_ERR(priv->base))
422421
return PTR_ERR(priv->base);
423422

0 commit comments

Comments
 (0)