On Wed, Mar 10, 2010 at 3:03 PM, Jeff Mahoney <je...@suse.com> wrote: > mpc52xx_gpt_wdt_setup is defined as 0, which causes the following build > failure with gcc 4.5, since it's built with -Werror. > > arch/powerpc/platforms/52xx/mpc52xx_gpt.c:761:3: error: statement with no > effect > > Defining it as do { } while(0) fixes the problem.
Hi Jeff, thanks for the patch. I've picked it up with a change. Instead of a #define, I've changed it to an empty static inline. As akpm likes to say, we should try to program in C, not pre-processor. :-) diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52x index 072b948..5d7cc88 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c @@ -711,7 +711,11 @@ static int __devinit mpc52xx_gpt_wdt_init(void) return 0; } -#define mpc52xx_gpt_wdt_setup(x, y) (0) +static inline int mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv *gpt, + const u32 *period) +{ + return 0; +} #endif /* CONFIG_MPC5200_WDT */ > > Signed-off-by: Jeff Mahoney <je...@suse.com> > --- > arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c > +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c > @@ -711,7 +711,7 @@ static int __devinit mpc52xx_gpt_wdt_ini > return 0; > } > > -#define mpc52xx_gpt_wdt_setup(x, y) (0) > +#define mpc52xx_gpt_wdt_setup(x, y) do { } while(0) > > #endif /* CONFIG_MPC5200_WDT */ > > -- > Jeff Mahoney > SUSE Labs > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev