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

Commit 055f87a2 authored by Jan Kiszka's avatar Jan Kiszka Committed by Bjorn Helgaas
Browse files

PCI: Pass struct device to of_pci_get_host_bridge_resources() 



Another step towards a managed version of
of_pci_get_host_bridge_resources(): Feed in the underlying device, rather
than just the OF node.  This will allow us to use managed resource
allocation internally later on.

Tested-by: default avatarVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Acked-by: default avatarJingoo Han <jingoohan1@gmail.com>
CC: Joao Pinto <Joao.Pinto@synopsys.com>
CC: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent 126b7de6

drivers/pci/dwc/pcie-designware-host.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ int dw_pcie_host_init(struct pcie_port *pp) 
	if (!bridge)

		return -ENOMEM;



	ret = of_pci_get_host_bridge_resources(np, 0, 0xff,

	ret = of_pci_get_host_bridge_resources(dev, 0, 0xff,

					&bridge->windows, &pp->io_base);

	if (ret)

		return ret;

drivers/pci/host/pci-aardvark.c

+2 −3
Original line number Diff line number Diff line
@@ -815,14 +815,13 @@ static int advk_pcie_parse_request_of_pci_ranges(struct advk_pcie *pcie) 
{

	int err, res_valid = 0;

	struct device *dev = &pcie->pdev->dev;

	struct device_node *np = dev->of_node;

	struct resource_entry *win, *tmp;

	resource_size_t iobase;



	INIT_LIST_HEAD(&pcie->resources);



	err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pcie->resources,

					       &iobase);

	err = of_pci_get_host_bridge_resources(dev, 0, 0xff,

						    &pcie->resources, &iobase);

	if (err)

		return err;

drivers/pci/host/pci-ftpci100.c

+2 −2
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static int faraday_pci_probe(struct platform_device *pdev) 
	if (IS_ERR(p->base))

		return PTR_ERR(p->base);



	ret = of_pci_get_host_bridge_resources(dev->of_node, 0, 0xff,

	ret = of_pci_get_host_bridge_resources(dev, 0, 0xff,

						    &res, &io_base);

	if (ret)

		return ret;

drivers/pci/host/pci-v3-semi.c

+2 −1
Original line number Diff line number Diff line
@@ -791,7 +791,8 @@ static int v3_pci_probe(struct platform_device *pdev) 
	if (IS_ERR(v3->config_base))

		return PTR_ERR(v3->config_base);



	ret = of_pci_get_host_bridge_resources(np, 0, 0xff, &res, &io_base);

	ret = of_pci_get_host_bridge_resources(dev, 0, 0xff, &res,

						    &io_base);

	if (ret)

		return ret;

drivers/pci/host/pci-versatile.c

+1 −2
Original line number Diff line number Diff line
@@ -64,11 +64,10 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev, 
						     struct list_head *res)

{

	int err, mem = 1, res_valid = 0;

	struct device_node *np = dev->of_node;

	resource_size_t iobase;

	struct resource_entry *win, *tmp;



	err = of_pci_get_host_bridge_resources(np, 0, 0xff, res, &iobase);

	err = of_pci_get_host_bridge_resources(dev, 0, 0xff, res, &iobase);

	if (err)

		return err;