PCI: generic: Request host bridge window resources with core function

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>

1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/pci/host/pci-host-common.c b/drivers/pci/host/pci-host-common.c
index 8cba7ab73df9..533d50c500a9 100644
--- a/drivers/pci/host/pci-host-common.c
+++ b/drivers/pci/host/pci-host-common.c
@@ -36,12 +36,15 @@ static int gen_pci_parse_request_of_pci_ranges(struct device *dev,
         if (err)
                 return err;
 
+        err = devm_request_pci_bus_resources(dev, resources);
+        if (err)
+                goto out_release_res;
+
         resource_list_for_each_entry(win, 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",
@@ -50,7 +53,6 @@ static int gen_pci_parse_request_of_pci_ranges(struct device *dev,
                         }
                         break;
                 case IORESOURCE_MEM:
-                        parent = &iomem_resource;
                         res_valid |= !(res->flags & IORESOURCE_PREFETCH);
                         break;
                 case IORESOURCE_BUS:
@@ -58,10 +60,6 @@ static int gen_pci_parse_request_of_pci_ranges(struct device *dev,
                 default:
                         continue;
                 }
-
-                err = devm_request_resource(dev, parent, res);
-                if (err)
-                        goto out_release_res;
         }
 
         if (!res_valid) {