[PATCH] arch/powerpc: Drop unnecessary of_node_put
Grant Likely
grant.likely at secretlab.ca
Thu Aug 5 10:01:08 EST 2010
On Tue, Aug 3, 2010 at 1:50 PM, Julia Lawall <julia at diku.dk> wrote:
> From: Julia Lawall <julia at diku.dk>
>
> for_each_node_by_name only exits when its first argument is NULL, and a
> subsequent call to of_node_put on that argument is unnecessary.
>
> The semantic patch that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> iterator name for_each_node_by_name;
> expression np,E;
> identifier l;
> @@
>
> for_each_node_by_name(np,...) {
> ... when != break;
> when != goto l;
> }
> ... when != np = E
> - of_node_put(np);
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia at diku.dk>
Looks correct to me:
Reviewed-by: Grant Likely <grant.likely at secretlab.ca>
>
> ---
> arch/powerpc/platforms/powermac/feature.c | 1 -
> arch/powerpc/platforms/powermac/pci.c | 2 --
> 2 files changed, 3 deletions(-)
>
> diff -u -p a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
> --- a/arch/powerpc/platforms/powermac/feature.c
> +++ b/arch/powerpc/platforms/powermac/feature.c
> @@ -2872,7 +2872,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
> +++ b/arch/powerpc/platforms/powermac/pci.c
> @@ -1155,13 +1155,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);
> }
>
> void pmac_pci_fixup_cardbus(struct pci_dev* dev)
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
More information about the Linuxppc-dev
mailing list