]> git.karo-electronics.de Git - linux-beck.git/commitdiff
PCI: rcar: Request host bridge window resources with core function
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 31 May 2016 17:20:57 +0000 (12:20 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 25 Jun 2016 12:44:23 +0000 (07:44 -0500)
Use devm_request_pci_bus_resources() to request host bridge window
resources instead of doing it by hand in the driver.

No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/host/pcie-rcar.c

index 35092188039b99264f7911a3fdd91005c043d4d0..ce096db38af400bebba6318c4cf327e7534b7478 100644 (file)
@@ -955,12 +955,15 @@ static int rcar_pcie_parse_request_of_pci_ranges(struct rcar_pcie *pci)
        if (err)
                return err;
 
+       err = devm_request_pci_bus_resources(dev, &pci->resources);
+       if (err)
+               goto out_release_res;
+
        resource_list_for_each_entry(win, &pci->resources) {
-               struct resource *parent, *res = win->res;
+               struct resource *res = win->res;
 
                switch (resource_type(res)) {
                case IORESOURCE_IO:
-                       parent = &ioport_resource;
                        err = pci_remap_iospace(res, iobase);
                        if (err) {
                                dev_warn(dev, "error %d: failed to map resource %pR\n",
@@ -969,17 +972,12 @@ static int rcar_pcie_parse_request_of_pci_ranges(struct rcar_pcie *pci)
                        }
                        break;
                case IORESOURCE_MEM:
-                       parent = &iomem_resource;
                        break;
 
                case IORESOURCE_BUS:
                default:
                        continue;
                }
-
-               err = devm_request_resource(dev, parent, res);
-               if (err)
-                       goto out_release_res;
        }
 
        return 0;