diff options
| author | Bjorn Helgaas | 2016-06-06 22:47:24 +0200 |
|---|---|---|
| committer | Bjorn Helgaas | 2016-06-25 14:44:24 +0200 |
| commit | 45c64b6ac4ef0f50ba754e997585c02b10c93c02 (patch) | |
| tree | 679964345a0aad5c5c9beac122abd4c7661bf086 /drivers/pci | |
| parent | PCI: tegra: Remove top-level resource from hierarchy (diff) | |
| download | kernel-qcow2-linux-45c64b6ac4ef0f50ba754e997585c02b10c93c02.tar.gz kernel-qcow2-linux-45c64b6ac4ef0f50ba754e997585c02b10c93c02.tar.xz kernel-qcow2-linux-45c64b6ac4ef0f50ba754e997585c02b10c93c02.zip | |
PCI: tegra: 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/pci-tegra.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index 920a8990c596..6e6ef0d3d739 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -626,17 +626,7 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys) if (err < 0) return err; - err = devm_request_resource(pcie->dev, &ioport_resource, &pcie->pio); - if (err < 0) - return err; - - err = devm_request_resource(pcie->dev, &iomem_resource, &pcie->mem); - if (err < 0) - return err; - - err = devm_request_resource(pcie->dev, &iomem_resource, &pcie->prefetch); - if (err) - return err; + pci_ioremap_io(pcie->pio.start, pcie->io.start); pci_add_resource_offset(&sys->resources, &pcie->pio, sys->io_offset); pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset); @@ -644,7 +634,9 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys) sys->mem_offset); pci_add_resource(&sys->resources, &pcie->busn); - pci_ioremap_io(pcie->pio.start, pcie->io.start); + err = devm_request_pci_bus_resources(pcie->dev, &sys->resources); + if (err < 0) + return err; return 1; } |