On Wed, 28 Aug 2024 15:38:23 +0800 Zhang Zekun <zhangzekun11@xxxxxxxxxx> wrote: > for_each_available_child_of_node_scoped() provides a scope-based cleanup > functinality to put the device_node automatically, and we don't need to > call of_node_put() directly. Let's simplify the code a bit with the use > of these functions. > > Signed-off-by: Zhang Zekun <zhangzekun11@xxxxxxxxxx> Another case in here where return dev_err_probe() would be nice, but looks good to me either way. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> > --- > drivers/pci/controller/pcie-mt7621.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/controller/pcie-mt7621.c b/drivers/pci/controller/pcie-mt7621.c > index 9b4754a45515..16c3df1c49a1 100644 > --- a/drivers/pci/controller/pcie-mt7621.c > +++ b/drivers/pci/controller/pcie-mt7621.c > @@ -258,19 +258,18 @@ static int mt7621_pcie_parse_dt(struct mt7621_pcie *pcie) > { > struct device *dev = pcie->dev; > struct platform_device *pdev = to_platform_device(dev); > - struct device_node *node = dev->of_node, *child; > + struct device_node *node = dev->of_node; > int err; > > pcie->base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(pcie->base)) > return PTR_ERR(pcie->base); > > - for_each_available_child_of_node(node, child) { > + for_each_available_child_of_node_scoped(node, child) { > int slot; > > err = of_pci_get_devfn(child); > if (err < 0) { > - of_node_put(child); > dev_err(dev, "failed to parse devfn: %d\n", err); > return err; > } > @@ -278,10 +277,8 @@ static int mt7621_pcie_parse_dt(struct mt7621_pcie *pcie) > slot = PCI_SLOT(err); > > err = mt7621_pcie_parse_port(pcie, child, slot); > - if (err) { > - of_node_put(child); > + if (err) > return err; > - } > } > > return 0;