]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
soc: qcom: apr: simplify with scoped for each OF child loop
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Tue, 13 Aug 2024 13:09:47 +0000 (15:09 +0200)
committerBjorn Andersson <andersson@kernel.org>
Thu, 15 Aug 2024 03:14:43 +0000 (22:14 -0500)
Use scoped for_each_child_of_node_scoped() when iterating over device
nodes to make code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240813-b4-cleanup-h-of-node-put-other-v1-1-cfb67323a95c@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/soc/qcom/apr.c

index 4fbff3a890e23fa83eeaa1b013ef0c912f70db39..a956c407ce0302a11105d5a042733005547abe9f 100644 (file)
@@ -485,11 +485,10 @@ static int of_apr_add_pd_lookups(struct device *dev)
 {
        const char *service_name, *service_path;
        struct packet_router *apr = dev_get_drvdata(dev);
-       struct device_node *node;
        struct pdr_service *pds;
        int ret;
 
-       for_each_child_of_node(dev->of_node, node) {
+       for_each_child_of_node_scoped(dev->of_node, node) {
                ret = of_property_read_string_index(node, "qcom,protection-domain",
                                                    0, &service_name);
                if (ret < 0)
@@ -499,14 +498,12 @@ static int of_apr_add_pd_lookups(struct device *dev)
                                                    1, &service_path);
                if (ret < 0) {
                        dev_err(dev, "pdr service path missing: %d\n", ret);
-                       of_node_put(node);
                        return ret;
                }
 
                pds = pdr_add_lookup(apr->pdr, service_name, service_path);
                if (IS_ERR(pds) && PTR_ERR(pds) != -EALREADY) {
                        dev_err(dev, "pdr add lookup failed: %ld\n", PTR_ERR(pds));
-                       of_node_put(node);
                        return PTR_ERR(pds);
                }
        }