Patchwork [U-Boot,10/14] board/mpl/common/flash.c: Fix GCC 4.6 build warning

login
register
mail settings
Submitter Wolfgang Denk
Date Nov. 30, 2011, 8:17 a.m.
Message ID <1322641077-829-11-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/128446/
State Accepted
Commit ae5f6b3b2fa26eb82b58bd162535e5a80ebed543
Headers show

Comments

Wolfgang Denk - Nov. 30, 2011, 8:17 a.m.
Fix:
../common/flash.c: In function 'flash_init':
../common/flash.c:160:16: warning: variable 'size_b1' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Denis Peter <d.peter@mpl.ch>
---
ERROR: space required after that ',' (ctx:VxV)
#26: FILE: board/mpl/common/flash.c:160:
+	unsigned long flashcr,size_reg;
 	                     ^

total: 1 errors, 0 warnings, 15 lines checked

NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE

Error ignored.  No further cleanup attempted.

 board/mpl/common/flash.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
Marek Vasut - Dec. 1, 2011, 10:14 p.m.
> Fix:
> ../common/flash.c: In function 'flash_init':
> ../common/flash.c:160:16: warning: variable 'size_b1' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Denis Peter <d.peter@mpl.ch>
> ---
> ERROR: space required after that ',' (ctx:VxV)
> #26: FILE: board/mpl/common/flash.c:160:
> +	unsigned long flashcr,size_reg;
>  	                     ^
> 
> total: 1 errors, 0 warnings, 15 lines checked
> 
> NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX
> MULTISTATEMENT_MACRO_USE_DO_WHILE
> 
> Error ignored.  No further cleanup attempted.
> 
>  board/mpl/common/flash.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c
> index 81d7271..d5b63c0 100644
> --- a/board/mpl/common/flash.c
> +++ b/board/mpl/common/flash.c
> @@ -157,7 +157,7 @@ unsigned long flash_init (void)
>  	int i;
> 
>  #if !defined(CONFIG_PATI)
> -	unsigned long size_b1,flashcr,size_reg;
> +	unsigned long flashcr,size_reg;

Can you please add space after the comma (", ") ? Thank you.

>  	int mode;
>  	extern char version_string;
>  	char *p = &version_string;
> @@ -197,7 +197,6 @@ unsigned long flash_init (void)
>  #if !defined(CONFIG_PATI)
>  	/* protect reset vector */
>  	flash_info[0].protect[flash_info[0].sector_count-1] = 1;
> -	size_b1 = 0 ;
>  	flash_info[0].size = size_b0;
>  	/* set up flash cs according to the size */
>  	size_reg=(flash_info[0].size >>20);

Otherwise, logic looks OK

Acked-by: Marek Vasut <marek.vasut@gmail.com>
Wolfgang Denk - Dec. 1, 2011, 11:15 p.m.
Dear Marek Vasut,

In message <201112012314.25106.marek.vasut@gmail.com> you wrote:
> > Fix:
> > ../common/flash.c: In function 'flash_init':
> > ../common/flash.c:160:16: warning: variable 'size_b1' set but not used
> > [-Wunused-but-set-variable]
> > 
> > Signed-off-by: Wolfgang Denk <wd@denx.de>
> > Cc: Denis Peter <d.peter@mpl.ch>
> > ---
> > ERROR: space required after that ',' (ctx:VxV)
> > #26: FILE: board/mpl/common/flash.c:160:
> > +	unsigned long flashcr,size_reg;
> >  	                     ^
> > 
> > total: 1 errors, 0 warnings, 15 lines checked
> > 
> > NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX
> > MULTISTATEMENT_MACRO_USE_DO_WHILE
> > 
> > Error ignored.  No further cleanup attempted.
...

> > -	unsigned long size_b1,flashcr,size_reg;
> > +	unsigned long flashcr,size_reg;
> 
> Can you please add space after the comma (", ") ? Thank you.

No. I intentionally don't start cleaning up this file.

Best regards,

Wolfgang Denk
Wolfgang Denk - Dec. 1, 2011, 11:16 p.m.
Dear Wolfgang Denk,

In message <1322641077-829-11-git-send-email-wd@denx.de> you wrote:
> Fix:
> ../common/flash.c: In function 'flash_init':
> ../common/flash.c:160:16: warning: variable 'size_b1' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Denis Peter <d.peter@mpl.ch>
> ---
> ERROR: space required after that ',' (ctx:VxV)
> #26: FILE: board/mpl/common/flash.c:160:
> +	unsigned long flashcr,size_reg;
>  	                     ^
> 
> total: 1 errors, 0 warnings, 15 lines checked
> 
> NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE
> 
> Error ignored.  No further cleanup attempted.
> 
>  board/mpl/common/flash.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/board/mpl/common/flash.c b/board/mpl/common/flash.c
index 81d7271..d5b63c0 100644
--- a/board/mpl/common/flash.c
+++ b/board/mpl/common/flash.c
@@ -157,7 +157,7 @@  unsigned long flash_init (void)
 	int i;
 
 #if !defined(CONFIG_PATI)
-	unsigned long size_b1,flashcr,size_reg;
+	unsigned long flashcr,size_reg;
 	int mode;
 	extern char version_string;
 	char *p = &version_string;
@@ -197,7 +197,6 @@  unsigned long flash_init (void)
 #if !defined(CONFIG_PATI)
 	/* protect reset vector */
 	flash_info[0].protect[flash_info[0].sector_count-1] = 1;
-	size_b1 = 0 ;
 	flash_info[0].size = size_b0;
 	/* set up flash cs according to the size */
 	size_reg=(flash_info[0].size >>20);