diff options
author | Julia Lawall <julia.lawall@lip6.fr> | 2015-10-09 13:47:40 -0400 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2016-06-14 05:39:39 -0400 |
commit | d1122e4b7639941305166628613a42fdf6e16296 (patch) | |
tree | 6eb7e1446979d44820e5725ffe4989ee42a912ec | |
parent | aafb197f75cec20331c84ade2da9bc94ae0b9aff (diff) |
memory: tegra: Delete unneeded of_node_put()
for_each_child_of_node() performs an of_node_put() on each iteration, so
putting an of_node_put() before a continue results in a double put.
The semantic match that finds this problem is as follows
(http://coccinelle.lip6.fr):
// <smpl>
@@
expression root,e;
local idexpression child;
iterator name for_each_child_of_node;
@@
for_each_child_of_node(root, child) {
... when != of_node_get(child)
* of_node_put(child);
...
* continue;
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r-- | drivers/memory/tegra/mc.c | 4 | ||||
-rw-r--r-- | drivers/memory/tegra/tegra124-emc.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c index a1ae0cc2b86d..85ce4beb7f03 100644 --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c | |||
@@ -206,10 +206,8 @@ static int tegra_mc_setup_timings(struct tegra_mc *mc) | |||
206 | for_each_child_of_node(mc->dev->of_node, node) { | 206 | for_each_child_of_node(mc->dev->of_node, node) { |
207 | err = of_property_read_u32(node, "nvidia,ram-code", | 207 | err = of_property_read_u32(node, "nvidia,ram-code", |
208 | &node_ram_code); | 208 | &node_ram_code); |
209 | if (err || (node_ram_code != ram_code)) { | 209 | if (err || (node_ram_code != ram_code)) |
210 | of_node_put(node); | ||
211 | continue; | 210 | continue; |
212 | } | ||
213 | 211 | ||
214 | err = load_timings(mc, node); | 212 | err = load_timings(mc, node); |
215 | if (err) | 213 | if (err) |
diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c index 02a63177c6e7..06cc781ebac1 100644 --- a/drivers/memory/tegra/tegra124-emc.c +++ b/drivers/memory/tegra/tegra124-emc.c | |||
@@ -997,10 +997,8 @@ tegra_emc_find_node_by_ram_code(struct device_node *node, u32 ram_code) | |||
997 | u32 value; | 997 | u32 value; |
998 | 998 | ||
999 | err = of_property_read_u32(np, "nvidia,ram-code", &value); | 999 | err = of_property_read_u32(np, "nvidia,ram-code", &value); |
1000 | if (err || (value != ram_code)) { | 1000 | if (err || (value != ram_code)) |
1001 | of_node_put(np); | ||
1002 | continue; | 1001 | continue; |
1003 | } | ||
1004 | 1002 | ||
1005 | return np; | 1003 | return np; |
1006 | } | 1004 | } |