]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
clocksource/drivers/arm_arch_timer: Using for_each_available_child_of_node_scoped()
authorZhang Zekun <zhangzekun11@huawei.com>
Wed, 7 Aug 2024 07:46:55 +0000 (15:46 +0800)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Fri, 6 Sep 2024 12:49:20 +0000 (14:49 +0200)
for_each_available_child_of_node_scoped() can put the device_node
automatically. So, using it to make the code logic more simple and
remove the device_node clean up code.

Signed-off-by: Zhang Zekun <zhangzekun11@huawei.com>
Link: https://lore.kernel.org/r/20240807074655.52157-1-zhangzekun11@huawei.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
drivers/clocksource/arm_arch_timer.c

index aeafc74181f0716fffb817cc3d24e9b7ae9a2aa7..03733101e23174a6a327c8388862caf5d541cf73 100644 (file)
@@ -1594,7 +1594,6 @@ static int __init arch_timer_mem_of_init(struct device_node *np)
 {
        struct arch_timer_mem *timer_mem;
        struct arch_timer_mem_frame *frame;
-       struct device_node *frame_node;
        struct resource res;
        int ret = -EINVAL;
        u32 rate;
@@ -1608,33 +1607,29 @@ static int __init arch_timer_mem_of_init(struct device_node *np)
        timer_mem->cntctlbase = res.start;
        timer_mem->size = resource_size(&res);
 
-       for_each_available_child_of_node(np, frame_node) {
+       for_each_available_child_of_node_scoped(np, frame_node) {
                u32 n;
                struct arch_timer_mem_frame *frame;
 
                if (of_property_read_u32(frame_node, "frame-number", &n)) {
                        pr_err(FW_BUG "Missing frame-number.\n");
-                       of_node_put(frame_node);
                        goto out;
                }
                if (n >= ARCH_TIMER_MEM_MAX_FRAMES) {
                        pr_err(FW_BUG "Wrong frame-number, only 0-%u are permitted.\n",
                               ARCH_TIMER_MEM_MAX_FRAMES - 1);
-                       of_node_put(frame_node);
                        goto out;
                }
                frame = &timer_mem->frame[n];
 
                if (frame->valid) {
                        pr_err(FW_BUG "Duplicated frame-number.\n");
-                       of_node_put(frame_node);
                        goto out;
                }
 
-               if (of_address_to_resource(frame_node, 0, &res)) {
-                       of_node_put(frame_node);
+               if (of_address_to_resource(frame_node, 0, &res))
                        goto out;
-               }
+
                frame->cntbase = res.start;
                frame->size = resource_size(&res);