Messages in this thread Patch in this message | | | Date | Sun, 2 Dec 2007 21:00:38 +0100 (CET) | From | Julia Lawall <> | Subject | Subject: [PATCH] arch/powerpc/platforms/powermac: Drop unneeded of_node_put |
| |
From: Julia Lawall <julia@diku.dk>
After using for_each_node_by_name, there is no need for of_node_put unless there was a break in the loop body, as for_each_node_by_name does a of_node_put on each of the elements it returns.
This was detected and fixed using the following semantic patch. (http://www.emn.fr/x-info/coccinelle/)
// <smpl> @@ iterator for_each_node_by_name; expression d; @@
for_each_node_by_name(d,...) { ... when != break; } ... when != d ?- of_node_put(d); // </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk> ---
diff -u -p a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c --- a/arch/powerpc/platforms/powermac/feature.c 2007-08-12 13:27:05.000000000 +0200 +++ b/arch/powerpc/platforms/powermac/feature.c 2007-12-02 17:16:04.000000000 +0100 @@ -2861,7 +2861,6 @@ set_initial_features(void) core99_airport_enable(np, 0, 0); } } - of_node_put(np); } /* On all machines that support sound PM, switch sound off */ diff -u -p a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c --- a/arch/powerpc/platforms/powermac/pci.c 2007-10-22 11:24:59.000000000 +0200 +++ b/arch/powerpc/platforms/powermac/pci.c 2007-12-02 17:16:05.000000000 +0100 @@ -1162,13 +1162,11 @@ void __init pmac_pcibios_after_init(void pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, nd, 0, 0); } } - of_node_put(nd); for_each_node_by_name(nd, "ethernet") { if (nd->parent && of_device_is_compatible(nd, "gmac") && of_device_is_compatible(nd->parent, "uni-north")) pmac_call_feature(PMAC_FTR_GMAC_ENABLE, nd, 0, 0); } - of_node_put(nd); } #ifdef CONFIG_PPC32
| |