PCI: mvebu: 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, 7 insertions, 10 deletions

diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 6b451df6502c..2287a4e18add 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -839,25 +839,22 @@ static struct pci_ops mvebu_pcie_ops = {
 static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
 {
         struct mvebu_pcie *pcie = sys_to_pcie(sys);
-        int i;
+        int err, i;
 
         pcie->mem.name = "PCI MEM";
         pcie->realio.name = "PCI I/O";
 
-        if (request_resource(&iomem_resource, &pcie->mem))
-                return 0;
-
-        if (resource_size(&pcie->realio) != 0) {
-                if (request_resource(&ioport_resource, &pcie->realio)) {
-                        release_resource(&pcie->mem);
-                        return 0;
-                }
+        if (resource_size(&pcie->realio) != 0)
                 pci_add_resource_offset(&sys->resources, &pcie->realio,
                                         sys->io_offset);
-        }
+
         pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset);
         pci_add_resource(&sys->resources, &pcie->busn);
 
+        err = devm_request_pci_bus_resources(&pcie->pdev->dev, &sys->resources);
+        if (err)
+                return 0;
+
         for (i = 0; i < pcie->nports; i++) {
                 struct mvebu_pcie_port *port = &pcie->ports[i];