Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 10:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clocksource/drivers/arm_arch_timer: Using for_each_available_child_of_node_scoped()

Browse Source 
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>
This commit is contained in:
Zhang Zekun 2024-08-07 15:46:55 +08:00 committed by Daniel Lezcano
parent 0c87282074
commit a7456d7d1b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/clocksource/arm_arch_timer.c
View 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 *timer_mem;
struct arch_timer_mem_frame *frame; struct arch_timer_mem_frame *frame;
struct device_node *frame_node;
struct resource res; struct resource res;
int ret = -EINVAL; int ret = -EINVAL;
u32 rate; 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->cntctlbase = res.start;
timer_mem->size = resource_size(&res); 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; u32 n;
struct arch_timer_mem_frame *frame; struct arch_timer_mem_frame *frame;
if (of_property_read_u32(frame_node, "frame-number", &n)) { if (of_property_read_u32(frame_node, "frame-number", &n)) {
pr_err(FW_BUG "Missing frame-number.\n"); pr_err(FW_BUG "Missing frame-number.\n");
of_node_put(frame_node);
goto out; goto out;
} }
if (n >= ARCH_TIMER_MEM_MAX_FRAMES) { if (n >= ARCH_TIMER_MEM_MAX_FRAMES) {
pr_err(FW_BUG "Wrong frame-number, only 0-%u are permitted.\n", pr_err(FW_BUG "Wrong frame-number, only 0-%u are permitted.\n",
ARCH_TIMER_MEM_MAX_FRAMES - 1); ARCH_TIMER_MEM_MAX_FRAMES - 1);
of_node_put(frame_node);
goto out; goto out;
} }
frame = &timer_mem->frame[n]; frame = &timer_mem->frame[n];
if (frame->valid) { if (frame->valid) {
pr_err(FW_BUG "Duplicated frame-number.\n"); pr_err(FW_BUG "Duplicated frame-number.\n");
of_node_put(frame_node);
goto out; goto out;
} }
if (of_address_to_resource(frame_node, 0, &res)) { if (of_address_to_resource(frame_node, 0, &res))
of_node_put(frame_node);
goto out; goto out;
}
frame->cntbase = res.start; frame->cntbase = res.start;
frame->size = resource_size(&res); frame->size = resource_size(&res);