OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ARM: OMAP2+: add missing of_node_put before break and return 

Fix following coccicheck warning:
WARNING: Function "for_each_matching_node_and_match"
should have of_node_put() before return.

Early exits from for_each_matching_node_and_match should decrement the
node reference counter.

Signed-off-by: Wang Qing <wangqing@vivo.com>
Message-Id: <1639388545-63615-1-git-send-email-wangqing@vivo.com>
[tony@atomide.com: updated for omap_hwmod.c that was already patched]
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Wang Qing 2021-12-13 01:42:24 -08:00 committed by Tony Lindgren
parent 71ff461c3f
commit 883f464c1d
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-omap2/cm_common.c
View File

@ -320,8 +320,10 @@ int __init omap2_cm_base_init(void)
data = (struct omap_prcm_init_data *)match->data; data = (struct omap_prcm_init_data *)match->data;
ret = of_address_to_resource(np, 0, &res); ret = of_address_to_resource(np, 0, &res);
if (ret) if (ret) {
of_node_put(np);
return ret; return ret;
}
if (data->index == TI_CLKM_CM) if (data->index == TI_CLKM_CM)
mem = &cm_base; mem = &cm_base;
@ -367,8 +369,10 @@ int __init omap_cm_init(void)
continue; continue;
ret = omap2_clk_provider_init(np, data->index, NULL, data->mem); ret = omap2_clk_provider_init(np, data->index, NULL, data->mem);
if (ret) if (ret) {
of_node_put(np);
return ret; return ret;
}
} }
return 0; return 0;

19
arch/arm/mach-omap2/control.c
View File

@ -769,8 +769,10 @@ int __init omap2_control_base_init(void)
data = (struct control_init_data *)match->data; data = (struct control_init_data *)match->data;
mem = of_iomap(np, 0); mem = of_iomap(np, 0);
if (!mem) if (!mem) {
of_node_put(np);
return -ENOMEM; return -ENOMEM;
}
if (data->index == TI_CLKM_CTRL) { if (data->index == TI_CLKM_CTRL) {
omap2_ctrl_base = mem; omap2_ctrl_base = mem;
@ -810,22 +812,24 @@ int __init omap_control_init(void)
if (scm_conf) { if (scm_conf) {
syscon = syscon_node_to_regmap(scm_conf); syscon = syscon_node_to_regmap(scm_conf);
if (IS_ERR(syscon)) if (IS_ERR(syscon)) {
return PTR_ERR(syscon); ret = PTR_ERR(syscon);
goto of_node_put;
}
if (of_get_child_by_name(scm_conf, "clocks")) { if (of_get_child_by_name(scm_conf, "clocks")) {
ret = omap2_clk_provider_init(scm_conf, ret = omap2_clk_provider_init(scm_conf,
data->index, data->index,
syscon, NULL); syscon, NULL);
if (ret) if (ret)
return ret; goto of_node_put;
} }
} else { } else {
/* No scm_conf found, direct access */ /* No scm_conf found, direct access */
ret = omap2_clk_provider_init(np, data->index, NULL, ret = omap2_clk_provider_init(np, data->index, NULL,
data->mem); data->mem);
if (ret) if (ret)
return ret; goto of_node_put;
} }
} }
@ -836,6 +840,11 @@ int __init omap_control_init(void)
} }
return 0; return 0;
of_node_put:
of_node_put(np);
return ret;
} }
/** /**

8
arch/arm/mach-omap2/prm_common.c
View File

@ -752,8 +752,10 @@ int __init omap2_prm_base_init(void)
data = (struct omap_prcm_init_data *)match->data; data = (struct omap_prcm_init_data *)match->data;
ret = of_address_to_resource(np, 0, &res); ret = of_address_to_resource(np, 0, &res);
if (ret) if (ret) {
of_node_put(np);
return ret; return ret;
}
data->mem = ioremap(res.start, resource_size(&res)); data->mem = ioremap(res.start, resource_size(&res));
@ -799,8 +801,10 @@ int __init omap_prcm_init(void)
data = match->data; data = match->data;
ret = omap2_clk_provider_init(np, data->index, NULL, data->mem); ret = omap2_clk_provider_init(np, data->index, NULL, data->mem);
if (ret) if (ret) {
of_node_put(np);
return ret; return ret;
}
} }
omap_cm_init(); omap_cm_init();