[PATCH v2 07/25] PCI: iproc: Use pci_parse_request_of_pci_ranges()

[Rob Herring]

Convert the iProc host bridge to use the common
pci_parse_request_of_pci_ranges().

There's no need to assign the resources to a temporary list, so just use
bridge->windows directly.

Cc: Lorenzo Pieralisi <lorenzo.pieral...@arm.com>
Cc: Andrew Murray <andrew.mur...@arm.com>
Cc: Bjorn Helgaas <bhelg...@google.com>
Cc: Ray Jui <r...@broadcom.com>
Cc: Scott Branden <sbran...@broadcom.com>
Cc: bcm-kernel-feedback-l...@broadcom.com
Signed-off-by: Rob Herring <r...@kernel.org>
---
v2:
- New patch

 drivers/pci/controller/pcie-iproc-platform.c | 8 ++------
 drivers/pci/controller/pcie-iproc.c          | 5 -----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/pci/controller/pcie-iproc-platform.c 
b/drivers/pci/controller/pcie-iproc-platform.c
index 9ee6200a66f4..375d815f7301 100644
--- a/drivers/pci/controller/pcie-iproc-platform.c
+++ b/drivers/pci/controller/pcie-iproc-platform.c
@@ -43,8 +43,6 @@ static int iproc_pcie_pltfm_probe(struct platform_device 
*pdev)
        struct iproc_pcie *pcie;
        struct device_node *np = dev->of_node;
        struct resource reg;
-       resource_size_t iobase = 0;
-       LIST_HEAD(resources);
        struct pci_host_bridge *bridge;
        int ret;

@@ -97,8 +95,7 @@ static int iproc_pcie_pltfm_probe(struct platform_device 
*pdev)
        if (IS_ERR(pcie->phy))
                return PTR_ERR(pcie->phy);

-       ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, &resources,
-                                                   &iobase);
+       ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL);
        if (ret) {
                dev_err(dev, "unable to get PCI host bridge resources\n");
                return ret;
@@ -113,10 +110,9 @@ static int iproc_pcie_pltfm_probe(struct platform_device 
*pdev)
                pcie->map_irq = of_irq_parse_and_map_pci;
        }

-       ret = iproc_pcie_setup(pcie, &resources);
+       ret = iproc_pcie_setup(pcie, &bridge->windows);
        if (ret) {
                dev_err(dev, "PCIe controller setup failed\n");
-               pci_free_resource_list(&resources);
                return ret;
        }

diff --git a/drivers/pci/controller/pcie-iproc.c 
b/drivers/pci/controller/pcie-iproc.c
index 2d457bfdaf66..223335ee791a 100644
--- a/drivers/pci/controller/pcie-iproc.c
+++ b/drivers/pci/controller/pcie-iproc.c
@@ -1498,10 +1498,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct 
list_head *res)
                return ret;
        }

-       ret = devm_request_pci_bus_resources(dev, res);
-       if (ret)
-               return ret;
-
        ret = phy_init(pcie->phy);
        if (ret) {
                dev_err(dev, "unable to initialize PCIe PHY\n");
@@ -1543,7 +1539,6 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct 
list_head *res)
                if (iproc_pcie_msi_enable(pcie))
                        dev_info(dev, "not using iProc MSI\n");

-       list_splice_init(res, &host->windows);
        host->busnr = 0;
        host->dev.parent = dev;
        host->ops = &iproc_pcie_ops;
--
2.20.1