On Sat, Aug 31, 2024 at 12:04:10PM +0800, Zhang Zekun wrote:
> for_each_available_child_of_node_scoped() provides a scope-based cleanup
> functionality 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>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
- Mani
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> ---
> v2:
> - Use dev_err_probe() to simplify code.
> - Fix spelling error in commit message.
>
> drivers/pci/controller/pcie-mediatek.c | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
> index 9be3cebd862e..0457b9d0ad8b 100644
> --- a/drivers/pci/controller/pcie-mediatek.c
> +++ b/drivers/pci/controller/pcie-mediatek.c
> @@ -1042,24 +1042,22 @@ 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;
> - }
> + if (err < 0)
> + 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 +1078,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)
> --
> 2.17.1
>
--
மணிவண்ணன் சதாசிவம்
