PCI: altera: Use pci_parse_request_of_pci_ranges()

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

There's no need to assign the resources to a temporary list first. Just
use bridge->windows directly and remove all the temporary list handling.

If an I/O range is present, then it will now be mapped. It's expected
that h/w which doesn't support I/O range will not define one.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Andrew Murray <andrew.murray@arm.com>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: rfi@lists.rocketboards.org

diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c
index d2497ca438285c093a517e235ca52d958b3a7335..ba025efeae28dac359834664c5a02062e307702f 100644 (file)
--- a/drivers/pci/controller/pcie-altera.c
+++ b/drivers/pci/controller/pcie-altera.c
@@ -92,7 +92,6 @@ struct altera_pcie {
        u8                      root_bus_nr;
        struct irq_domain       *irq_domain;
        struct resource         bus_range;
-       struct list_head        resources;
        const struct altera_pcie_data   *pcie_data;
 };
 
@@ -670,39 +669,6 @@ static void altera_pcie_isr(struct irq_desc *desc)
        chained_irq_exit(chip, desc);
 }
 
-static int altera_pcie_parse_request_of_pci_ranges(struct altera_pcie *pcie)
-{
-       int err, res_valid = 0;
-       struct device *dev = &pcie->pdev->dev;
-       struct resource_entry *win;
-
-       err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,
-                                                   &pcie->resources, NULL);
-       if (err)
-               return err;
-
-       err = devm_request_pci_bus_resources(dev, &pcie->resources);
-       if (err)
-               goto out_release_res;
-
-       resource_list_for_each_entry(win, &pcie->resources) {
-               struct resource *res = win->res;
-
-               if (resource_type(res) == IORESOURCE_MEM)
-                       res_valid |= !(res->flags & IORESOURCE_PREFETCH);
-       }
-
-       if (res_valid)
-               return 0;
-
-       dev_err(dev, "non-prefetchable memory resource required\n");
-       err = -EINVAL;
-
-out_release_res:
-       pci_free_resource_list(&pcie->resources);
-       return err;
-}
-
 static int altera_pcie_init_irq_domain(struct altera_pcie *pcie)
 {
        struct device *dev = &pcie->pdev->dev;
@@ -833,9 +799,8 @@ static int altera_pcie_probe(struct platform_device *pdev)
                return ret;
        }
 
-       INIT_LIST_HEAD(&pcie->resources);
-
-       ret = altera_pcie_parse_request_of_pci_ranges(pcie);
+       ret = pci_parse_request_of_pci_ranges(dev, &bridge->windows,
+                                             NULL);
        if (ret) {
                dev_err(dev, "Failed add resources\n");
                return ret;
@@ -853,7 +818,6 @@ static int altera_pcie_probe(struct platform_device *pdev)
        cra_writel(pcie, P2A_INT_ENA_ALL, P2A_INT_ENABLE);
        altera_pcie_host_init(pcie);
 
-       list_splice_init(&pcie->resources, &bridge->windows);
        bridge->dev.parent = dev;
        bridge->sysdata = pcie;
        bridge->busnr = pcie->root_bus_nr;
@@ -884,7 +848,6 @@ static int altera_pcie_remove(struct platform_device *pdev)
 
        pci_stop_root_bus(bridge->bus);
        pci_remove_root_bus(bridge->bus);
-       pci_free_resource_list(&pcie->resources);
        altera_pcie_irq_teardown(pcie);
 
        return 0;