]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
remoteproc: mtk_scp: Simplify with scoped for each OF child loop
authorKrzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Fri, 2 Jan 2026 12:48:28 +0000 (13:48 +0100)
committerMathieu Poirier <mathieu.poirier@linaro.org>
Mon, 5 Jan 2026 21:28:33 +0000 (14:28 -0700)
Use scoped for-each loop when iterating over device nodes to make code a
bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260102124827.64355-3-krzysztof.kozlowski@oss.qualcomm.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
drivers/remoteproc/mtk_scp.c

index db8fd045468d9a53b14b2b24c1ed9f3168d3c05f..328541e621589e3d3e9efbf330451336512ecfdb 100644 (file)
@@ -1287,7 +1287,6 @@ static int scp_add_multi_core(struct platform_device *pdev,
        struct device *dev = &pdev->dev;
        struct device_node *np = dev_of_node(dev);
        struct platform_device *cpdev;
-       struct device_node *child;
        struct list_head *scp_list = &scp_cluster->mtk_scp_list;
        const struct mtk_scp_of_data **cluster_of_data;
        struct mtk_scp *scp, *temp;
@@ -1296,11 +1295,10 @@ static int scp_add_multi_core(struct platform_device *pdev,
 
        cluster_of_data = (const struct mtk_scp_of_data **)of_device_get_match_data(dev);
 
-       for_each_available_child_of_node(np, child) {
+       for_each_available_child_of_node_scoped(np, child) {
                if (!cluster_of_data[core_id]) {
                        ret = -EINVAL;
                        dev_err(dev, "Not support core %d\n", core_id);
-                       of_node_put(child);
                        goto init_fail;
                }
 
@@ -1308,7 +1306,6 @@ static int scp_add_multi_core(struct platform_device *pdev,
                if (!cpdev) {
                        ret = -ENODEV;
                        dev_err(dev, "Not found platform device for core %d\n", core_id);
-                       of_node_put(child);
                        goto init_fail;
                }
 
@@ -1317,14 +1314,12 @@ static int scp_add_multi_core(struct platform_device *pdev,
                if (IS_ERR(scp)) {
                        ret = PTR_ERR(scp);
                        dev_err(dev, "Failed to initialize core %d rproc\n", core_id);
-                       of_node_put(child);
                        goto init_fail;
                }
 
                ret = rproc_add(scp->rproc);
                if (ret) {
                        dev_err(dev, "Failed to add rproc of core %d\n", core_id);
-                       of_node_put(child);
                        scp_free(scp);
                        goto init_fail;
                }