diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-05-31 12:20:57 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-06-25 07:44:23 -0500 |
| commit | 6fd7f550975a2186493dbea6170acbe7da3b8ab9 (patch) | |
| tree | 3d4b168b2cee0806abfb6a72d11ffa3c654d3eb8 /drivers/pci | |
| parent | ac575ead871f6529f30baeda5ac34696ac64ec33 (diff) | |
| download | blackbird-op-linux-6fd7f550975a2186493dbea6170acbe7da3b8ab9.tar.gz blackbird-op-linux-6fd7f550975a2186493dbea6170acbe7da3b8ab9.zip | |
PCI: rcar: 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>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/host/pcie-rcar.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 35092188039b..ce096db38af4 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -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; |
