PCI: mvebu: Use of_get_available_child_count() (7de36cd5) · Commits · 戴 / test

Rather than open-coding of_get_available_child_count(), use the provided helper instead. Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> (Armada XP GP) Tested-by: Andrew Lunn <andrew@lunn.ch> (Kirkwood DIR665) Signed-off-by:

Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:

Bjorn Helgaas <bhelgaas@google.com> Reviewed-by:

Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

drivers/pci/host/pci-mvebu.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -933,7 +933,7 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
		struct mvebu_pcie *pcie;
		struct device_node *np = pdev->dev.of_node;
		struct device_node *child;
		int i, ret;
		int num, i, ret;

		pcie = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_pcie),
		GFP_KERNEL);
		@@ -969,14 +969,9 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
		return ret;
		}

		i = 0;
		for_each_child_of_node(pdev->dev.of_node, child) {
		if (!of_device_is_available(child))
		continue;
		i++;
		}
		num = of_get_available_child_count(pdev->dev.of_node);

		pcie->ports = devm_kzalloc(&pdev->dev, i *
		pcie->ports = devm_kzalloc(&pdev->dev, num *
		sizeof(struct mvebu_pcie_port),
		GFP_KERNEL);
		if (!pcie->ports)

Admin message