Patchwork [U-Boot,07/14] board/sandburst/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-8-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/128453/
State Accepted
Commit effa4e30b06e7c4c7d4535bcab8e40652262b13c
Headers show

Comments

Wolfgang Denk - Nov. 30, 2011, 8:17 a.m.
Fix:
../common/flash.c: In function 'flash_erase':
../common/flash.c:307:24: warning: variable 'l_sect' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Travis Sawyer <travis.sawyer@sandburst.com>
---
total: 0 errors, 0 warnings, 23 lines checked
NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE

 board/sandburst/common/flash.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
Marek Vasut - Dec. 1, 2011, 10:11 p.m.
> Fix:
> ../common/flash.c: In function 'flash_erase':
> ../common/flash.c:307:24: warning: variable 'l_sect' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Travis Sawyer <travis.sawyer@sandburst.com>
> ---
> total: 0 errors, 0 warnings, 23 lines checked
> NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX
> MULTISTATEMENT_MACRO_USE_DO_WHILE
> 
>  board/sandburst/common/flash.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/board/sandburst/common/flash.c
> b/board/sandburst/common/flash.c index c65cb96..818a7c3 100644
> --- a/board/sandburst/common/flash.c
> +++ b/board/sandburst/common/flash.c
> @@ -304,7 +304,7 @@ int flash_erase (flash_info_t *info, int s_first, int
> s_last) {
>  	volatile FLASH_WORD_SIZE *addr = (FLASH_WORD_SIZE *)(info->start[0]);
>  	volatile FLASH_WORD_SIZE *addr2;
> -	int flag, prot, sect, l_sect;
> +	int flag, prot, sect;
>  	int i;
> 
>  	if ((s_first < 0) || (s_first > s_last)) {
> @@ -335,8 +335,6 @@ int flash_erase (flash_info_t *info, int s_first, int
> s_last) printf ("\n");
>  	}
> 
> -	l_sect = -1;
> -
>  	/* Disable interrupts which might cause a timeout here */
>  	flag = disable_interrupts();
> 
> @@ -363,7 +361,6 @@ int flash_erase (flash_info_t *info, int s_first, int
> s_last) addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
>  				addr2[0] = (FLASH_WORD_SIZE)0x00300030;	 /* 
sector erase */
>  			}
> -			l_sect = sect;
>  			/*
>  			 * Wait for each sector to complete, it's more
>  			 * reliable.  According to AMD Spec, you must

Logically looks OK

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

In message <1322641077-829-8-git-send-email-wd@denx.de> you wrote:
> Fix:
> ../common/flash.c: In function 'flash_erase':
> ../common/flash.c:307:24: warning: variable 'l_sect' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Travis Sawyer <travis.sawyer@sandburst.com>
> ---
> total: 0 errors, 0 warnings, 23 lines checked
> NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE
> 
>  board/sandburst/common/flash.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/board/sandburst/common/flash.c b/board/sandburst/common/flash.c
index c65cb96..818a7c3 100644
--- a/board/sandburst/common/flash.c
+++ b/board/sandburst/common/flash.c
@@ -304,7 +304,7 @@  int flash_erase (flash_info_t *info, int s_first, int s_last)
 {
 	volatile FLASH_WORD_SIZE *addr = (FLASH_WORD_SIZE *)(info->start[0]);
 	volatile FLASH_WORD_SIZE *addr2;
-	int flag, prot, sect, l_sect;
+	int flag, prot, sect;
 	int i;
 
 	if ((s_first < 0) || (s_first > s_last)) {
@@ -335,8 +335,6 @@  int flash_erase (flash_info_t *info, int s_first, int s_last)
 		printf ("\n");
 	}
 
-	l_sect = -1;
-
 	/* Disable interrupts which might cause a timeout here */
 	flag = disable_interrupts();
 
@@ -363,7 +361,6 @@  int flash_erase (flash_info_t *info, int s_first, int s_last)
 				addr[ADDR1] = (FLASH_WORD_SIZE)0x00550055;
 				addr2[0] = (FLASH_WORD_SIZE)0x00300030;	 /* sector erase */
 			}
-			l_sect = sect;
 			/*
 			 * Wait for each sector to complete, it's more
 			 * reliable.  According to AMD Spec, you must