[media.git/next] media: samsung: exynos4-is: Use for_each_available_child_of_node_scoped()

[media-ci]

On Fri Aug 23 17:02:15 2024 +0800, Jinjie Ruan wrote:
> Avoids the need for manual cleanup of_node_put() in early exits
> from the loop.
> 
> Signed-off-by: Jinjie Ruan <ruanjin...@huawei.com>
> Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>

Patch committed.

Thanks,
Hans Verkuil

 .../media/platform/samsung/exynos4-is/media-dev.c  | 27 +++++++---------------
 1 file changed, 8 insertions(+), 19 deletions(-)

---

diff --git a/drivers/media/platform/samsung/exynos4-is/media-dev.c 
b/drivers/media/platform/samsung/exynos4-is/media-dev.c
index b5ee3c547789..c781853586fd 100644
--- a/drivers/media/platform/samsung/exynos4-is/media-dev.c
+++ b/drivers/media/platform/samsung/exynos4-is/media-dev.c
@@ -482,15 +482,12 @@ static int fimc_md_parse_one_endpoint(struct fimc_md *fmd,
 static int fimc_md_parse_port_node(struct fimc_md *fmd,
                                   struct device_node *port)
 {
-       struct device_node *ep;
        int ret;
 
-       for_each_child_of_node(port, ep) {
+       for_each_child_of_node_scoped(port, ep) {
                ret = fimc_md_parse_one_endpoint(fmd, ep);
-               if (ret < 0) {
-                       of_node_put(ep);
+               if (ret < 0)
                        return ret;
-               }
        }
 
        return 0;
@@ -501,7 +498,6 @@ static int fimc_md_register_sensor_entities(struct fimc_md 
*fmd)
 {
        struct device_node *parent = fmd->pdev->dev.of_node;
        struct device_node *ports = NULL;
-       struct device_node *node;
        int ret;
 
        /*
@@ -518,7 +514,7 @@ static int fimc_md_register_sensor_entities(struct fimc_md 
*fmd)
        fmd->num_sensors = 0;
 
        /* Attach sensors linked to MIPI CSI-2 receivers */
-       for_each_available_child_of_node(parent, node) {
+       for_each_available_child_of_node_scoped(parent, node) {
                struct device_node *port;
 
                if (!of_node_name_eq(node, "csis"))
@@ -530,10 +526,8 @@ static int fimc_md_register_sensor_entities(struct fimc_md 
*fmd)
 
                ret = fimc_md_parse_port_node(fmd, port);
                of_node_put(port);
-               if (ret < 0) {
-                       of_node_put(node);
+               if (ret < 0)
                        goto cleanup;
-               }
        }
 
        /* Attach sensors listed in the parallel-ports node */
@@ -541,12 +535,10 @@ static int fimc_md_register_sensor_entities(struct 
fimc_md *fmd)
        if (!ports)
                goto rpm_put;
 
-       for_each_child_of_node(ports, node) {
+       for_each_child_of_node_scoped(ports, node) {
                ret = fimc_md_parse_port_node(fmd, node);
-               if (ret < 0) {
-                       of_node_put(node);
+               if (ret < 0)
                        goto cleanup;
-               }
        }
        of_node_put(ports);
 
@@ -736,10 +728,9 @@ dev_unlock:
 static int fimc_md_register_platform_entities(struct fimc_md *fmd,
                                              struct device_node *parent)
 {
-       struct device_node *node;
        int ret = 0;
 
-       for_each_available_child_of_node(parent, node) {
+       for_each_available_child_of_node_scoped(parent, node) {
                struct platform_device *pdev;
                int plat_entity = -1;
 
@@ -762,10 +753,8 @@ static int fimc_md_register_platform_entities(struct 
fimc_md *fmd,
                        ret = fimc_md_register_platform_entity(fmd, pdev,
                                                        plat_entity);
                put_device(&pdev->dev);
-               if (ret < 0) {
-                       of_node_put(node);
+               if (ret < 0)
                        break;
-               }
        }
 
        return ret;