Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/pci/host/pci-mvebu.c

+7 −10
Original line number Diff line number Diff line
@@ -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];