* [PATCH 0/9] add missing of_node_put
@ 2015-10-24 14:42 Julia Lawall
2015-10-24 14:42 ` [PATCH 8/9] soc: ti: knav_qmss_queue: " Julia Lawall
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Julia Lawall @ 2015-10-24 14:42 UTC (permalink / raw)
To: linux-arm-kernel
The various for_each device_node iterators performs an of_node_get on each
iteration, so a break out of the loop requires an of_node_put.
The complete semantic patch that fixes this problem is
(http://coccinelle.lip6.fr):
// <smpl>
@r@
local idexpression n;
expression e1,e2;
iterator name for_each_node_by_name, for_each_node_by_type,
for_each_compatible_node, for_each_matching_node,
for_each_matching_node_and_match, for_each_child_of_node,
for_each_available_child_of_node, for_each_node_with_property;
iterator i;
statement S;
expression list [n1] es;
@@
(
(
for_each_node_by_name(n,e1) S
|
for_each_node_by_type(n,e1) S
|
for_each_compatible_node(n,e1,e2) S
|
for_each_matching_node(n,e1) S
|
for_each_matching_node_and_match(n,e1,e2) S
|
for_each_child_of_node(e1,n) S
|
for_each_available_child_of_node(e1,n) S
|
for_each_node_with_property(n,e1) S
)
&
i(es,n,...) S
)
@@
local idexpression r.n;
iterator r.i;
expression e;
expression list [r.n1] es;
@@
i(es,n,...) {
...
(
of_node_put(n);
|
e = n
|
return n;
|
+ of_node_put(n);
? return ...;
)
...
}
@@
local idexpression r.n;
iterator r.i;
expression e;
expression list [r.n1] es;
@@
i(es,n,...) {
...
(
of_node_put(n);
|
e = n
|
+ of_node_put(n);
? break;
)
...
}
... when != n
@@
local idexpression r.n;
iterator r.i;
expression e;
identifier l;
expression list [r.n1] es;
@@
i(es,n,...) {
...
(
of_node_put(n);
|
e = n
|
+ of_node_put(n);
? goto l;
)
...
}
...
l: ... when != n// </smpl>
---
drivers/bluetooth/btmrvl_main.c | 5 ++++-
drivers/gpu/drm/tegra/dc.c | 4 +++-
drivers/gpu/host1x/bus.c | 4 +++-
drivers/leds/leds-88pm860x.c | 1 +
drivers/leds/leds-bcm6328.c | 4 +++-
drivers/leds/leds-bcm6358.c | 4 +++-
drivers/leds/leds-powernv.c | 8 ++++++--
drivers/pinctrl/pinctrl-at91.c | 5 ++++-
drivers/soc/ti/knav_qmss_queue.c | 3 +++
9 files changed, 30 insertions(+), 8 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 8/9] soc: ti: knav_qmss_queue: add missing of_node_put
2015-10-24 14:42 [PATCH 0/9] add missing of_node_put Julia Lawall
@ 2015-10-24 14:42 ` Julia Lawall
2015-10-24 14:42 ` [PATCH 9/9] pinctrl: at91: " Julia Lawall
2015-10-26 8:48 ` [PATCH 0/9] " Jacek Anaszewski
2 siblings, 0 replies; 6+ messages in thread
From: Julia Lawall @ 2015-10-24 14:42 UTC (permalink / raw)
To: linux-arm-kernel
for_each_child_of_node performs an of_node_get on each iteration, so
a break out of the loop requires an of_node_put.
A simplified version of the semantic patch that fixes this problem is as
follows (http://coccinelle.lip6.fr):
// <smpl>
@@
expression root,e;
local idexpression child;
@@
for_each_child_of_node(root, child) {
... when != of_node_put(child)
when != e = child
(
return child;
|
+ of_node_put(child);
? return ...;
)
...
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
---
drivers/soc/ti/knav_qmss_queue.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_queue.c
index 89789e2..6f3d12b 100644
--- a/drivers/soc/ti/knav_qmss_queue.c
+++ b/drivers/soc/ti/knav_qmss_queue.c
@@ -1074,6 +1074,7 @@ static int knav_queue_setup_regions(struct knav_device *kdev,
region = devm_kzalloc(dev, sizeof(*region), GFP_KERNEL);
if (!region) {
dev_err(dev, "out of memory allocating region\n");
+ of_node_put(child);
return -ENOMEM;
}
@@ -1373,6 +1374,7 @@ static int knav_queue_init_qmgrs(struct knav_device *kdev,
qmgr = devm_kzalloc(dev, sizeof(*qmgr), GFP_KERNEL);
if (!qmgr) {
dev_err(dev, "out of memory allocating qmgr\n");
+ of_node_put(child);
return -ENOMEM;
}
@@ -1450,6 +1452,7 @@ static int knav_queue_init_pdsps(struct knav_device *kdev,
pdsp = devm_kzalloc(dev, sizeof(*pdsp), GFP_KERNEL);
if (!pdsp) {
dev_err(dev, "out of memory allocating pdsp\n");
+ of_node_put(child);
return -ENOMEM;
}
pdsp->name = knav_queue_find_name(child);
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 9/9] pinctrl: at91: add missing of_node_put
2015-10-24 14:42 [PATCH 0/9] add missing of_node_put Julia Lawall
2015-10-24 14:42 ` [PATCH 8/9] soc: ti: knav_qmss_queue: " Julia Lawall
@ 2015-10-24 14:42 ` Julia Lawall
2015-10-26 9:52 ` Ludovic Desroches
2015-10-27 16:18 ` Linus Walleij
2015-10-26 8:48 ` [PATCH 0/9] " Jacek Anaszewski
2 siblings, 2 replies; 6+ messages in thread
From: Julia Lawall @ 2015-10-24 14:42 UTC (permalink / raw)
To: linux-arm-kernel
for_each_child_of_node performs an of_node_get on each iteration, so
a break out of the loop requires an of_node_put.
A simplified version of the semantic patch that fixes this problem is as
follows (http://coccinelle.lip6.fr):
// <smpl>
@@
expression root,e;
local idexpression child;
@@
for_each_child_of_node(root, child) {
... when != of_node_put(child)
when != e = child
(
return child;
|
+ of_node_put(child);
? return ...;
)
...
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
---
drivers/pinctrl/pinctrl-at91.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index ce6e589..0d2fc0c 100644
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -1122,8 +1122,10 @@ static int at91_pinctrl_parse_functions(struct device_node *np,
func->groups[i] = child->name;
grp = &info->groups[grp_index++];
ret = at91_pinctrl_parse_groups(child, grp, info, i++);
- if (ret)
+ if (ret) {
+ of_node_put(child);
return ret;
+ }
}
return 0;
@@ -1196,6 +1198,7 @@ static int at91_pinctrl_probe_dt(struct platform_device *pdev,
ret = at91_pinctrl_parse_functions(child, info, i++);
if (ret) {
dev_err(&pdev->dev, "failed to parse function\n");
+ of_node_put(child);
return ret;
}
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 0/9] add missing of_node_put
2015-10-24 14:42 [PATCH 0/9] add missing of_node_put Julia Lawall
2015-10-24 14:42 ` [PATCH 8/9] soc: ti: knav_qmss_queue: " Julia Lawall
2015-10-24 14:42 ` [PATCH 9/9] pinctrl: at91: " Julia Lawall
@ 2015-10-26 8:48 ` Jacek Anaszewski
2 siblings, 0 replies; 6+ messages in thread
From: Jacek Anaszewski @ 2015-10-26 8:48 UTC (permalink / raw)
To: linux-arm-kernel
Hi Julia,
Patches 1-4 have been applied to the LED tree, thanks.
On 10/24/2015 04:42 PM, Julia Lawall wrote:
> The various for_each device_node iterators performs an of_node_get on each
> iteration, so a break out of the loop requires an of_node_put.
>
> The complete semantic patch that fixes this problem is
> (http://coccinelle.lip6.fr):
>
[...]
--
Best Regards,
Jacek Anaszewski
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 9/9] pinctrl: at91: add missing of_node_put
2015-10-24 14:42 ` [PATCH 9/9] pinctrl: at91: " Julia Lawall
@ 2015-10-26 9:52 ` Ludovic Desroches
2015-10-27 16:18 ` Linus Walleij
1 sibling, 0 replies; 6+ messages in thread
From: Ludovic Desroches @ 2015-10-26 9:52 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Oct 24, 2015 at 04:42:35PM +0200, Julia Lawall wrote:
> for_each_child_of_node performs an of_node_get on each iteration, so
> a break out of the loop requires an of_node_put.
>
> A simplified version of the semantic patch that fixes this problem is as
> follows (http://coccinelle.lip6.fr):
>
> // <smpl>
> @@
> expression root,e;
> local idexpression child;
> @@
>
> for_each_child_of_node(root, child) {
> ... when != of_node_put(child)
> when != e = child
> (
> return child;
> |
> + of_node_put(child);
> ? return ...;
> )
> ...
> }
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
Acked-by: Ludovic Desroches <ludovic.desroches@atmel•com>
>
> ---
> drivers/pinctrl/pinctrl-at91.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
> index ce6e589..0d2fc0c 100644
> --- a/drivers/pinctrl/pinctrl-at91.c
> +++ b/drivers/pinctrl/pinctrl-at91.c
> @@ -1122,8 +1122,10 @@ static int at91_pinctrl_parse_functions(struct device_node *np,
> func->groups[i] = child->name;
> grp = &info->groups[grp_index++];
> ret = at91_pinctrl_parse_groups(child, grp, info, i++);
> - if (ret)
> + if (ret) {
> + of_node_put(child);
> return ret;
> + }
> }
>
> return 0;
> @@ -1196,6 +1198,7 @@ static int at91_pinctrl_probe_dt(struct platform_device *pdev,
> ret = at91_pinctrl_parse_functions(child, info, i++);
> if (ret) {
> dev_err(&pdev->dev, "failed to parse function\n");
> + of_node_put(child);
> return ret;
> }
> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 9/9] pinctrl: at91: add missing of_node_put
2015-10-24 14:42 ` [PATCH 9/9] pinctrl: at91: " Julia Lawall
2015-10-26 9:52 ` Ludovic Desroches
@ 2015-10-27 16:18 ` Linus Walleij
1 sibling, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2015-10-27 16:18 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Oct 24, 2015 at 4:42 PM, Julia Lawall <Julia.Lawall@lip6•fr> wrote:
> for_each_child_of_node performs an of_node_get on each iteration, so
> a break out of the loop requires an of_node_put.
>
> A simplified version of the semantic patch that fixes this problem is as
> follows (http://coccinelle.lip6.fr):
>
> // <smpl>
> @@
> expression root,e;
> local idexpression child;
> @@
>
> for_each_child_of_node(root, child) {
> ... when != of_node_put(child)
> when != e = child
> (
> return child;
> |
> + of_node_put(child);
> ? return ...;
> )
> ...
> }
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6•fr>
Patch applied with Ludovic's ACK.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-27 16:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-24 14:42 [PATCH 0/9] add missing of_node_put Julia Lawall
2015-10-24 14:42 ` [PATCH 8/9] soc: ti: knav_qmss_queue: " Julia Lawall
2015-10-24 14:42 ` [PATCH 9/9] pinctrl: at91: " Julia Lawall
2015-10-26 9:52 ` Ludovic Desroches
2015-10-27 16:18 ` Linus Walleij
2015-10-26 8:48 ` [PATCH 0/9] " Jacek Anaszewski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox