Skip to content

Commit

Permalink
PCI: kirin: Convert kirin_pcie_parse_port() to scoped iterator
Browse files Browse the repository at this point in the history
Convert loops in kirin_pcie_parse_port() to use the _scoped() version of
for_each_available_child_of_node() so the refcounts of children are
implicitly decremented when the loop is exited.

No functional change intended here, but it will make future error exits
from these loops easier.

Link: https://lore.kernel.org/linux-pci/[email protected]
Signed-off-by: Javier Carrasco <[email protected]>
Signed-off-by: Krzysztof Wilczyński <[email protected]>
[bhelgaas: move to GPIO series to avoid bisection hole, commit log]
Signed-off-by: Bjorn Helgaas <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
Reviewed-by: Manivannan Sadhasivam <[email protected]>
Reviewed-by: Jonathan Cameron <[email protected]>
  • Loading branch information
javiercarrascocruz authored and bjorn-helgaas committed Jul 9, 2024
1 parent 2e81122 commit 7e8e4fc
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions drivers/pci/controller/dwc/pcie-kirin.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,11 +400,10 @@ static int kirin_pcie_parse_port(struct kirin_pcie *pcie,
struct device_node *node)
{
struct device *dev = &pdev->dev;
struct device_node *parent, *child;
int ret, slot, i;

for_each_available_child_of_node(node, parent) {
for_each_available_child_of_node(parent, child) {
for_each_available_child_of_node_scoped(node, parent) {
for_each_available_child_of_node_scoped(parent, child) {
i = pcie->num_slots;

pcie->gpio_id_reset[i] = of_get_named_gpio(child,
Expand All @@ -415,34 +414,26 @@ static int kirin_pcie_parse_port(struct kirin_pcie *pcie,
pcie->num_slots++;
if (pcie->num_slots > MAX_PCI_SLOTS) {
dev_err(dev, "Too many PCI slots!\n");
ret = -EINVAL;
goto put_node;
return -EINVAL;
}

ret = of_pci_get_devfn(child);
if (ret < 0) {
dev_err(dev, "failed to parse devfn: %d\n", ret);
goto put_node;
return ret;
}

slot = PCI_SLOT(ret);

pcie->reset_names[i] = devm_kasprintf(dev, GFP_KERNEL,
"pcie_perst_%d",
slot);
if (!pcie->reset_names[i]) {
ret = -ENOMEM;
goto put_node;
}
if (!pcie->reset_names[i])
return -ENOMEM;
}
}

return 0;

put_node:
of_node_put(child);
of_node_put(parent);
return ret;
}

static long kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie,
Expand Down

0 comments on commit 7e8e4fc

Please sign in to comment.