Re: [PATCH] ppc: pic pmacpic_find_viaint cleanup

From: Benjamin Herrenschmidt
Date: Wed Jan 03 2007 - 15:53:28 EST


On Tue, 2007-01-02 at 20:20 +0100, Mariusz Kozlowski wrote:
> Hello,
>
> Litte rework to supress this warning:
>
> arch/powerpc/platforms/powermac/pic.c: In function 'pmacpic_find_viaint':
> arch/powerpc/platforms/powermac/pic.c:625: warning: label 'not_found' defined but not used
>
> Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx>

It's actually bogus (though the old code was too) now that we have
refcounting of device-nodes. We should do an of_node_put() on the result
of of_find_node_by_name() after we are done with it.

Can you respin with that fix ?

Ben.

> arch/powerpc/platforms/powermac/pic.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> --- linux-2.6.20-rc2-mm1-a/arch/powerpc/platforms/powermac/pic.c 2006-12-24 05:00:32.000000000 +0100
> +++ linux-2.6.20-rc2-mm1-b/arch/powerpc/platforms/powermac/pic.c 2007-01-02 16:49:05.000000000 +0100
> @@ -609,21 +609,18 @@ unsigned long sleep_save_mask[2];
> */
> static int pmacpic_find_viaint(void)
> {
> - int viaint = -1;
> -
> #ifdef CONFIG_ADB_PMU
> struct device_node *np;
>
> if (pmu_get_model() != PMU_OHARE_BASED)
> - goto not_found;
> + return -1;
> np = of_find_node_by_name(NULL, "via-pmu");
> if (np == NULL)
> - goto not_found;
> - viaint = irq_of_parse_and_map(np, 0);;
> + return -1;
> + return irq_of_parse_and_map(np, 0);
> +#else
> + return -1;
> #endif /* CONFIG_ADB_PMU */
> -
> -not_found:
> - return viaint;
> }
>
> static int pmacpic_suspend(struct sys_device *sysdev, pm_message_t state)
>
>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/