Commit 6df68f22 authored by Bjorn Helgaas's avatar Bjorn Helgaas

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: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 5aa182a2
...@@ -839,25 +839,22 @@ static struct pci_ops mvebu_pcie_ops = { ...@@ -839,25 +839,22 @@ static struct pci_ops mvebu_pcie_ops = {
static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys) static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
{ {
struct mvebu_pcie *pcie = sys_to_pcie(sys); struct mvebu_pcie *pcie = sys_to_pcie(sys);
int i; int err, i;
pcie->mem.name = "PCI MEM"; pcie->mem.name = "PCI MEM";
pcie->realio.name = "PCI I/O"; pcie->realio.name = "PCI I/O";
if (request_resource(&iomem_resource, &pcie->mem)) if (resource_size(&pcie->realio) != 0)
return 0;
if (resource_size(&pcie->realio) != 0) {
if (request_resource(&ioport_resource, &pcie->realio)) {
release_resource(&pcie->mem);
return 0;
}
pci_add_resource_offset(&sys->resources, &pcie->realio, pci_add_resource_offset(&sys->resources, &pcie->realio,
sys->io_offset); sys->io_offset);
}
pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset); pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset);
pci_add_resource(&sys->resources, &pcie->busn); 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++) { for (i = 0; i < pcie->nports; i++) {
struct mvebu_pcie_port *port = &pcie->ports[i]; struct mvebu_pcie_port *port = &pcie->ports[i];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment