| Message ID | 20240707-pcie-kirin-dev_err_probe-v2-2-2fa94951d84d@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Krzysztof Wilczyński |
| Headers | show |
| Series | PCI: kirin: cleanup (dev_err_probe() and scoped loop) | expand |
On Sun, 07 Jul 2024 15:54:02 +0200 Javier Carrasco <javier.carrasco.cruz@gmail.com> wrote: > The scoped version of the macro automatically decrements the child node > refcount on early exits, removing the need for the `goto` and > `of_node_put()`. > > Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/pci/controller/dwc/pcie-kirin.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c > index e00152b1ee99..7c591f50d0b2 100644 > --- a/drivers/pci/controller/dwc/pcie-kirin.c > +++ b/drivers/pci/controller/dwc/pcie-kirin.c > @@ -446,7 +446,7 @@ static long kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie, > struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > - struct device_node *child, *node = dev->of_node; > + struct device_node *node = dev->of_node; > void __iomem *apb_base; > int ret; > > @@ -471,17 +471,13 @@ static long kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie, > return ret; > > /* Parse OF children */ > - for_each_available_child_of_node(node, child) { > + for_each_available_child_of_node_scoped(node, child) { > ret = kirin_pcie_parse_port(kirin_pcie, pdev, child); > if (ret) > - goto put_node; > + return ret; > } > > return 0; > - > -put_node: > - of_node_put(child); > - return ret; > } > > static void kirin_pcie_sideband_dbi_w_mode(struct kirin_pcie *kirin_pcie, >
diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c index e00152b1ee99..7c591f50d0b2 100644 --- a/drivers/pci/controller/dwc/pcie-kirin.c +++ b/drivers/pci/controller/dwc/pcie-kirin.c @@ -446,7 +446,7 @@ static long kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie, struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct device_node *child, *node = dev->of_node; + struct device_node *node = dev->of_node; void __iomem *apb_base; int ret; @@ -471,17 +471,13 @@ static long kirin_pcie_get_resource(struct kirin_pcie *kirin_pcie, return ret; /* Parse OF children */ - for_each_available_child_of_node(node, child) { + for_each_available_child_of_node_scoped(node, child) { ret = kirin_pcie_parse_port(kirin_pcie, pdev, child); if (ret) - goto put_node; + return ret; } return 0; - -put_node: - of_node_put(child); - return ret; } static void kirin_pcie_sideband_dbi_w_mode(struct kirin_pcie *kirin_pcie,
The scoped version of the macro automatically decrements the child node refcount on early exits, removing the need for the `goto` and `of_node_put()`. Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> --- drivers/pci/controller/dwc/pcie-kirin.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)