Use scoped for_each_child_of_node_scoped() when iterating over device
nodes to make code a bit simpler.

And use the dev_err_probe() helper to simplify error handling during
probe. This also handle scenario, when EDEFER is returned and useless
error is printed.

Signed-off-by: Jinjie Ruan <ruanjin...@huawei.com>
---
 drivers/soc/ti/knav_dma.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/soc/ti/knav_dma.c b/drivers/soc/ti/knav_dma.c
index fb0746d8caad..eeec422a46f0 100644
--- a/drivers/soc/ti/knav_dma.c
+++ b/drivers/soc/ti/knav_dma.c
@@ -706,20 +706,15 @@ static int knav_dma_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct device_node *node = pdev->dev.of_node;
-       struct device_node *child;
        int ret = 0;
 
-       if (!node) {
-               dev_err(&pdev->dev, "could not find device info\n");
-               return -EINVAL;
-       }
+       if (!node)
+               return dev_err_probe(&pdev->dev, -EINVAL, "could not find 
device info\n");
 
        kdev = devm_kzalloc(dev,
                        sizeof(struct knav_dma_pool_device), GFP_KERNEL);
-       if (!kdev) {
-               dev_err(dev, "could not allocate driver mem\n");
-               return -ENOMEM;
-       }
+       if (!kdev)
+               return dev_err_probe(dev, -ENOMEM, "could not allocate driver 
mem\n");
 
        kdev->dev = dev;
        INIT_LIST_HEAD(&kdev->list);
@@ -732,10 +727,9 @@ static int knav_dma_probe(struct platform_device *pdev)
        }
 
        /* Initialise all packet dmas */
-       for_each_child_of_node(node, child) {
+       for_each_child_of_node_scoped(node, child) {
                ret = dma_init(node, child);
                if (ret) {
-                       of_node_put(child);
                        dev_err(&pdev->dev, "init failed with %d\n", ret);
                        break;
                }
-- 
2.34.1


Reply via email to