| Message ID | 20240828073825.43072-3-zhangzekun11@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Simplify code with _scoped() helper functions | expand |
On Wed, 28 Aug 2024 15:38:22 +0800 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> A nice to have inline. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/pci/controller/pcie-mediatek.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c > index 9be3cebd862e..d14e8d151c08 100644 > --- a/drivers/pci/controller/pcie-mediatek.c > +++ b/drivers/pci/controller/pcie-mediatek.c > @@ -1042,24 +1042,24 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie) > static int mtk_pcie_setup(struct mtk_pcie *pcie) > { > struct device *dev = pcie->dev; > - struct device_node *node = dev->of_node, *child; > + struct device_node *node = dev->of_node; > struct mtk_pcie_port *port, *tmp; > int err, slot; > > slot = of_get_pci_domain_nr(dev->of_node); > if (slot < 0) { > - for_each_available_child_of_node(node, child) { > + for_each_available_child_of_node_scoped(node, child) { > err = of_pci_get_devfn(child); > if (err < 0) { > dev_err(dev, "failed to get devfn: %d\n", err); > - goto error_put_node; > + return err; Could do return dev_err_probe(dev, err, "failed to get devfn\n"); > } > > slot = PCI_SLOT(err); > > err = mtk_pcie_parse_port(pcie, child, slot); > if (err) > - goto error_put_node; > + return err; > } > } else { > err = mtk_pcie_parse_port(pcie, node, slot); > @@ -1080,9 +1080,6 @@ static int mtk_pcie_setup(struct mtk_pcie *pcie) > mtk_pcie_subsys_powerdown(pcie); > > return 0; > -error_put_node: > - of_node_put(child); > - return err; > } > > static int mtk_pcie_probe(struct platform_device *pdev)
diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c index 9be3cebd862e..d14e8d151c08 100644 --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -1042,24 +1042,24 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie) static int mtk_pcie_setup(struct mtk_pcie *pcie) { struct device *dev = pcie->dev; - struct device_node *node = dev->of_node, *child; + struct device_node *node = dev->of_node; struct mtk_pcie_port *port, *tmp; int err, slot; slot = of_get_pci_domain_nr(dev->of_node); if (slot < 0) { - for_each_available_child_of_node(node, child) { + for_each_available_child_of_node_scoped(node, child) { err = of_pci_get_devfn(child); if (err < 0) { dev_err(dev, "failed to get devfn: %d\n", err); - goto error_put_node; + return err; } slot = PCI_SLOT(err); err = mtk_pcie_parse_port(pcie, child, slot); if (err) - goto error_put_node; + return err; } } else { err = mtk_pcie_parse_port(pcie, node, slot); @@ -1080,9 +1080,6 @@ static int mtk_pcie_setup(struct mtk_pcie *pcie) mtk_pcie_subsys_powerdown(pcie); return 0; -error_put_node: - of_node_put(child); - return err; } static int mtk_pcie_probe(struct platform_device *pdev)
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> --- drivers/pci/controller/pcie-mediatek.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)