PCI: tegra: Request host bridge window resources with core function
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 6 Jun 2016 20:47:24 +0000 (15:47 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 25 Jun 2016 12:44:24 +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/pci-tegra.c

index 920a8990c596eed19a33be452c50f9bc22a2dd44..6e6ef0d3d739b50a635b56441488beea9ce7030d 100644 (file)
@@ -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;
 }