| Message ID | 20240830035819.13718-5-zhangzekun11@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Simplify code with _scoped() helper functions | expand |
Hi, On Fri, Aug 30, 2024 at 6:11 AM Zhang Zekun <zhangzekun11@huawei.com> 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@huawei.com> > Reviewed-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > v2: > - Use dev_perr_probe to simplify code. > - Fix spelling error in commit message. This commit message still has the type 'functinality".... Thanks, Sergio Paracuellos > > drivers/pci/controller/pcie-mt7621.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) > > diff --git a/drivers/pci/controller/pcie-mt7621.c b/drivers/pci/controller/pcie-mt7621.c > index 9b4754a45515..354d401428f0 100644 > --- a/drivers/pci/controller/pcie-mt7621.c > +++ b/drivers/pci/controller/pcie-mt7621.c > @@ -258,30 +258,25 @@ 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; > - } > + if (err < 0) > + return dev_err_probe(dev, err, "failed to parse devfn\n"); > > slot = PCI_SLOT(err); > > err = mt7621_pcie_parse_port(pcie, child, slot); > - if (err) { > - of_node_put(child); > + if (err) > return err; > - } > } > > return 0; > -- > 2.17.1 >
diff --git a/drivers/pci/controller/pcie-mt7621.c b/drivers/pci/controller/pcie-mt7621.c index 9b4754a45515..354d401428f0 100644 --- a/drivers/pci/controller/pcie-mt7621.c +++ b/drivers/pci/controller/pcie-mt7621.c @@ -258,30 +258,25 @@ 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; - } + if (err < 0) + return dev_err_probe(dev, err, "failed to parse devfn\n"); slot = PCI_SLOT(err); err = mt7621_pcie_parse_port(pcie, child, slot); - if (err) { - of_node_put(child); + if (err) return err; - } } return 0;