Commit c1bb1449 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/iproc' 

- Don't fail devm_pci_alloc_host_bridge() on missing 'ranges' (Rob Herring)

- Fix BCMA probe resource handling (Rob Herring)

* remotes/lorenzo/pci/iproc:
  PCI: iproc: Fix BCMA probe resource handling
  PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges'
parents a1e4ca8e aeaea896

drivers/pci/controller/pcie-iproc-bcma.c

+6 −10
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev) 
{

	struct device *dev = &bdev->dev;

	struct iproc_pcie *pcie;

	LIST_HEAD(resources);

	struct pci_host_bridge *bridge;

	int ret;
@@ -60,19 +59,16 @@ static int iproc_pcie_bcma_probe(struct bcma_device *bdev) 
	pcie->mem.end = bdev->addr_s[0] + SZ_128M - 1;

	pcie->mem.name = "PCIe MEM space";

	pcie->mem.flags = IORESOURCE_MEM;

	pci_add_resource(&resources, &pcie->mem);

	pci_add_resource(&bridge->windows, &pcie->mem);

	ret = devm_request_pci_bus_resources(dev, &bridge->windows);

	if (ret)

		return ret;



	pcie->map_irq = iproc_pcie_bcma_map_irq;



	ret = iproc_pcie_setup(pcie, &resources);

	if (ret) {

		dev_err(dev, "PCIe controller setup failed\n");

		pci_free_resource_list(&resources);

		return ret;

	}



	bcma_set_drvdata(bdev, pcie);

	return 0;



	return iproc_pcie_setup(pcie, &bridge->windows);

}



static void iproc_pcie_bcma_remove(struct bcma_device *bdev)

drivers/pci/of.c

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev, 
	/* Check for ranges property */

	err = of_pci_range_parser_init(&parser, dev_node);

	if (err)

		goto failed;

		return 0;



	dev_dbg(dev, "Parsing ranges property...\n");

	for_each_of_pci_range(&parser, &range) {