Patchwork Fixed statement without effect by using a correct empty instruction

login
register
mail settings
Submitter Marcus Meissner
Date Feb. 24, 2010, 8:51 a.m.
Message ID <20100224085137.GA25801@suse.de>
Download mbox | patch
Permalink /patch/46117/
State Changes Requested
Headers show

Comments

Marcus Meissner - Feb. 24, 2010, 8:51 a.m.
This fixes this build failure:
cc1: warnings being treated as errors
/usr/src/packages/BUILD/kernel-default-2.6.33/linux-2.6.32/arch/powerpc/platforms/52xx/mpc52xx_gpt.c: In function 'mpc52xx_gpt_probe':
/usr/src/packages/BUILD/kernel-default-2.6.33/linux-2.6.32/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:761:3: error: statement with no effect

Signed-off-by: Marcus Meissner <meissner@suse.de>
---
 arch/powerpc/platforms/52xx/mpc52xx_gpt.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Grant Likely - Feb. 24, 2010, 1:40 p.m.
On Wed, Feb 24, 2010 at 1:51 AM, Marcus Meissner <meissner@suse.de> wrote:
> This fixes this build failure:
> cc1: warnings being treated as errors
> /usr/src/packages/BUILD/kernel-default-2.6.33/linux-2.6.32/arch/powerpc/platforms/52xx/mpc52xx_gpt.c: In function 'mpc52xx_gpt_probe':
> /usr/src/packages/BUILD/kernel-default-2.6.33/linux-2.6.32/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:761:3: error: statement with no effect
>
> Signed-off-by: Marcus Meissner <meissner@suse.de>

Hi Marcus, thanks for the patch.  One comment below...

> ---
>  arch/powerpc/platforms/52xx/mpc52xx_gpt.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
> index 6f8ebe1..88231d8 100644
> --- 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_init(void)
>        return 0;
>  }
>
> -#define mpc52xx_gpt_wdt_setup(x, y)            (0)
> +#define mpc52xx_gpt_wdt_setup(x, y)            do { } while (0)

As Andrew likes to say, we should be programming in C instead of preprocessor.

-#define mpc52xx_gpt_wdt_setup(x, y)            (0)
+static inline void mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv
*gpt, const u32 *period) { }
Marcus Meissner - Feb. 24, 2010, 1:43 p.m.
On Wed, Feb 24, 2010 at 06:40:37AM -0700, Grant Likely wrote:
> On Wed, Feb 24, 2010 at 1:51 AM, Marcus Meissner <meissner@suse.de> wrote:
> > This fixes this build failure:
> > cc1: warnings being treated as errors
> > /usr/src/packages/BUILD/kernel-default-2.6.33/linux-2.6.32/arch/powerpc/platforms/52xx/mpc52xx_gpt.c: In function 'mpc52xx_gpt_probe':
> > /usr/src/packages/BUILD/kernel-default-2.6.33/linux-2.6.32/arch/powerpc/platforms/52xx/mpc52xx_gpt.c:761:3: error: statement with no effect
> >
> > Signed-off-by: Marcus Meissner <meissner@suse.de>
> 
> Hi Marcus, thanks for the patch.  One comment below...
> 
> > ---
> >  arch/powerpc/platforms/52xx/mpc52xx_gpt.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
> > index 6f8ebe1..88231d8 100644
> > --- 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_init(void)
> >        return 0;
> >  }
> >
> > -#define mpc52xx_gpt_wdt_setup(x, y)            (0)
> > +#define mpc52xx_gpt_wdt_setup(x, y)            do { } while (0)
> 
> As Andrew likes to say, we should be programming in C instead of preprocessor.
> 
> -#define mpc52xx_gpt_wdt_setup(x, y)            (0)
> +static inline void mpc52xx_gpt_wdt_setup(struct mpc52xx_gpt_priv
> *gpt, const u32 *period) { }

Sounds good to me too. :)

Ciao, Marcus

Patch

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index 6f8ebe1..88231d8 100644
--- 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_init(void)
 	return 0;
 }
 
-#define mpc52xx_gpt_wdt_setup(x, y)		(0)
+#define mpc52xx_gpt_wdt_setup(x, y)		do { } while (0)
 
 #endif	/*  CONFIG_MPC5200_WDT	*/