Commit 3c65ebff authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: xilinx-nwl: Use pci_parse_request_of_pci_ranges() 



Convert the xilinx-nwl host bridge to use the common
pci_parse_request_of_pci_ranges().

There's no need to assign the resources to a temporary list first. Just
use bridge->windows directly and remove all the temporary list handling.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Andrew Murray <andrew.murray@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Michal Simek <michal.simek@xilinx.com>
parent ee352c27

drivers/pci/controller/pcie-xilinx-nwl.c

+4 −16
Original line number Diff line number Diff line
@@ -821,8 +821,6 @@ static int nwl_pcie_probe(struct platform_device *pdev) 
	struct pci_bus *child;

	struct pci_host_bridge *bridge;

	int err;

	resource_size_t iobase = 0;

	LIST_HEAD(res);



	bridge = devm_pci_alloc_host_bridge(dev, sizeof(*pcie));

	if (!bridge)
@@ -845,24 +843,18 @@ static int nwl_pcie_probe(struct platform_device *pdev) 
		return err;

	}



	err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff, &res,

						    &iobase);

	err = pci_parse_request_of_pci_ranges(dev, &bridge->windows, NULL);

	if (err) {

		dev_err(dev, "Getting bridge resources failed\n");

		return err;

	}



	err = devm_request_pci_bus_resources(dev, &res);

	if (err)

		goto error;



	err = nwl_pcie_init_irq_domain(pcie);

	if (err) {

		dev_err(dev, "Failed creating IRQ Domain\n");

		goto error;

		return err;

	}



	list_splice_init(&res, &bridge->windows);

	bridge->dev.parent = dev;

	bridge->sysdata = pcie;

	bridge->busnr = pcie->root_busno;
@@ -874,13 +866,13 @@ static int nwl_pcie_probe(struct platform_device *pdev) 
		err = nwl_pcie_enable_msi(pcie);

		if (err < 0) {

			dev_err(dev, "failed to enable MSI support: %d\n", err);

			goto error;

			return err;

		}

	}



	err = pci_scan_root_bus_bridge(bridge);

	if (err)

		goto error;

		return err;



	bus = bridge->bus;
@@ -889,10 +881,6 @@ static int nwl_pcie_probe(struct platform_device *pdev) 
		pcie_bus_configure_settings(child);

	pci_bus_add_devices(bus);

	return 0;



error:

	pci_free_resource_list(&res);

	return err;

}



static struct platform_driver nwl_pcie_driver = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE