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

Commit 5bd51b35 authored by Jan Kiszka's avatar Jan Kiszka Committed by Bjorn Helgaas
Browse files

PCI: Rework of_pci_get_host_bridge_resources() to devm_of_pci_get_host_bridge_resources() 



of_pci_get_host_bridge_resources() allocates the resource structures it
fills dynamically, but none of its callers care to release them so far.
Rather than requiring everyone to do this explicitly, convert the existing
function to a managed version.

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 avatarJoao Pinto <jpinto@synopsys.com>
Acked-by: default avatarJingoo Han <jingoohan1@gmail.com>
CC: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent d9c5d5ac

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(dev, 0, 0xff,

	ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,

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

	if (ret)

		return ret;

drivers/pci/host/pci-aardvark.c

+1 −1
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ static int advk_pcie_parse_request_of_pci_ranges(struct advk_pcie *pcie) 


	INIT_LIST_HEAD(&pcie->resources);



	err = of_pci_get_host_bridge_resources(dev, 0, 0xff,

	err = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,

						    &pcie->resources, &iobase);

	if (err)

		return err;

drivers/pci/host/pci-ftpci100.c

+1 −1
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, 0, 0xff,

	ret = devm_of_pci_get_host_bridge_resources(dev, 0, 0xff,

						    &res, &io_base);

	if (ret)

		return ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ 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(dev, 0, 0xff, &res,

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

						    &io_base);

	if (ret)

		return ret;

drivers/pci/host/pci-versatile.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev, 
	resource_size_t iobase;

	struct resource_entry *win, *tmp;



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

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

	if (err)

		return err;