Skip to content

Commit 3cf0eea

Browse files
Dejin ZhengLorenzo Pieralisi
authored andcommitted
PCI: controller: Convert to devm_platform_ioremap_resource()
Use devm_platform_ioremap_resource() to simplify the code, since t contains platform_get_resource() and devm_ioremap_resource() calls 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: Rob Herring <[email protected]>
1 parent e2dcd20 commit 3cf0eea

File tree

5 files changed

+7
-16
lines changed

5 files changed

+7
-16
lines changed

drivers/pci/controller/dwc/pci-exynos.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,12 @@ static int exynos5440_pcie_get_mem_resources(struct platform_device *pdev,
8484
{
8585
struct dw_pcie *pci = ep->pci;
8686
struct device *dev = pci->dev;
87-
struct resource *res;
8887

8988
ep->mem_res = devm_kzalloc(dev, sizeof(*ep->mem_res), GFP_KERNEL);
9089
if (!ep->mem_res)
9190
return -ENOMEM;
9291

93-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
94-
ep->mem_res->elbi_base = devm_ioremap_resource(dev, res);
92+
ep->mem_res->elbi_base = devm_platform_ioremap_resource(pdev, 0);
9593
if (IS_ERR(ep->mem_res->elbi_base))
9694
return PTR_ERR(ep->mem_res->elbi_base);
9795

drivers/pci/controller/pci-aardvark.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,7 +1105,7 @@ static int advk_pcie_probe(struct platform_device *pdev)
11051105
{
11061106
struct device *dev = &pdev->dev;
11071107
struct advk_pcie *pcie;
1108-
struct resource *res, *bus;
1108+
struct resource *bus;
11091109
struct pci_host_bridge *bridge;
11101110
int ret, irq;
11111111

@@ -1116,8 +1116,7 @@ static int advk_pcie_probe(struct platform_device *pdev)
11161116
pcie = pci_host_bridge_priv(bridge);
11171117
pcie->pdev = pdev;
11181118

1119-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1120-
pcie->base = devm_ioremap_resource(dev, res);
1119+
pcie->base = devm_platform_ioremap_resource(pdev, 0);
11211120
if (IS_ERR(pcie->base))
11221121
return PTR_ERR(pcie->base);
11231122

drivers/pci/controller/pci-ftpci100.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,6 @@ static int faraday_pci_probe(struct platform_device *pdev)
422422
struct device *dev = &pdev->dev;
423423
const struct faraday_pci_variant *variant =
424424
of_device_get_match_data(dev);
425-
struct resource *regs;
426425
struct resource_entry *win;
427426
struct faraday_pci *p;
428427
struct resource *io;
@@ -465,8 +464,7 @@ static int faraday_pci_probe(struct platform_device *pdev)
465464
return ret;
466465
}
467466

468-
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
469-
p->base = devm_ioremap_resource(dev, regs);
467+
p->base = devm_platform_ioremap_resource(pdev, 0);
470468
if (IS_ERR(p->base))
471469
return PTR_ERR(p->base);
472470

drivers/pci/controller/pci-versatile.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,11 @@ static int versatile_pci_probe(struct platform_device *pdev)
7676
if (!bridge)
7777
return -ENOMEM;
7878

79-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
80-
versatile_pci_base = devm_ioremap_resource(dev, res);
79+
versatile_pci_base = devm_platform_ioremap_resource(pdev, 0);
8180
if (IS_ERR(versatile_pci_base))
8281
return PTR_ERR(versatile_pci_base);
8382

84-
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
85-
versatile_cfg_base[0] = devm_ioremap_resource(dev, res);
83+
versatile_cfg_base[0] = devm_platform_ioremap_resource(pdev, 1);
8684
if (IS_ERR(versatile_cfg_base[0]))
8785
return PTR_ERR(versatile_cfg_base[0]);
8886

drivers/pci/controller/pcie-brcmstb.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,6 @@ static int brcm_pcie_probe(struct platform_device *pdev)
933933
struct pci_host_bridge *bridge;
934934
struct device_node *fw_np;
935935
struct brcm_pcie *pcie;
936-
struct resource *res;
937936
int ret;
938937

939938
/*
@@ -958,8 +957,7 @@ static int brcm_pcie_probe(struct platform_device *pdev)
958957
pcie->dev = &pdev->dev;
959958
pcie->np = np;
960959

961-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
962-
pcie->base = devm_ioremap_resource(&pdev->dev, res);
960+
pcie->base = devm_platform_ioremap_resource(pdev, 0);
963961
if (IS_ERR(pcie->base))
964962
return PTR_ERR(pcie->base);
965963

0 commit comments

Comments
 (0)