PCI: controller: Convert to devm_platform_ioremap_resource_byname()

Use devm_platform_ioremap_resource_byname() to simplify the code,
since it calls respectively platform_get_resource_byname() and
devm_ioremap_resource().

Link: https://lore.kernel.org/r/20200602171601.17630-1-zhengdejin5@gmail.com
Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>

diff --git a/drivers/pci/controller/cadence/pcie-cadence-ep.c b/drivers/pci/controller/cadence/pcie-cadence-ep.c
index 1c15c8352125efaf3428ad1a6f44454cf710afa3..74ffa03fde5f5f83acdbcb2420b3da8c249214a1 100644 (file)
--- 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 9f77e47983c3e828aec1713f8a47fa711603dbfb..59b9b3df4640442e02dc7a8b1cf52f0e34fa9d1c 100644 (file)
--- a/drivers/pci/controller/cadence/pcie-cadence-host.c
+++ b/drivers/pci/controller/cadence/pcie-cadence-host.c
@@ -217,8 +217,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 82fb36ed6f52d62fda68664d04bc8f6a66746b7d..71bf4b2684ac2a1c8f63238c8c5be47bac159a00 100644 (file)
--- 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 5aee802946cb47d4ebfee40ac3851a6722a004eb..4c783cfddb3a62549e490facd2c175aa60fafabb 100644 (file)
--- 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 16d938920ca57a7162d805a182fa9b0d67a0e3a2..613e19af71bd2d518a7bbff30bac75640eb7c64f 100644 (file)
--- 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 26ac3ad81de00f90573221065baedbe6b97266c4..4ffe382f220f32cd8ae4be862193ff0240506882 100644 (file)
--- 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 ebfa7d5a4e2dbc8723e7c221ea11dd3b5a10b005..d8e38276dbe340b7c7c096a08ff20bec3f26b069 100644 (file)
--- 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 c53d1322a3d6cf873eafc4ba4a5c9d93c56c662c..904dec0d3a88fd5dda0292980caa31dbc50e404c 100644 (file)
--- 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);