Skip to content

Commit

Permalink
PCI: versatile: Request host bridge window resources with core function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bjorn Helgaas committed Jun 25, 2016
1 parent 45c64b6 commit 2fbb353
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions drivers/pci/host/pci-versatile.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,15 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev,
if (err)
return err;

err = devm_request_pci_bus_resources(dev, res);
if (err)
goto out_release_res;

resource_list_for_each_entry(win, res) {
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",
Expand All @@ -94,7 +97,6 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev,
}
break;
case IORESOURCE_MEM:
parent = &iomem_resource;
res_valid |= !(res->flags & IORESOURCE_PREFETCH);

writel(res->start >> 28, PCI_IMAP(mem));
Expand All @@ -106,10 +108,6 @@ static int versatile_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) {
Expand Down

0 comments on commit 2fbb353

Please sign in to comment.