| Message ID | 1321559401-26495-3-git-send-email-wd@denx.de |
|---|---|
| State | Accepted |
| Commit | b63cb09719c993fc2812766c63df5a161fa2ac90 |
| Delegated to: | Stefan Roese |
| Headers | show |
On Thursday 17 November 2011 20:50:01 Wolfgang Denk wrote: > Fix: > flash.c: In function 'flash_erase_1': > flash.c:514:24: warning: variable 'l_sect' set but not used > [-Wunused-but-set-variable] > flash.c: In function 'flash_erase_2': > flash.c:956:24: warning: variable 'l_sect' set but not used > [-Wunused-but-set-variable] > > Signed-off-by: Wolfgang Denk <wd@denx.de> > Cc: Stefan Roese <sr@denx.de> Thanks. Acked-by: Stefan Roese <sr@denx.de> Best regards, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de
Dear Wolfgang Denk, In message <1321559401-26495-3-git-send-email-wd@denx.de> you wrote: > Fix: > flash.c: In function 'flash_erase_1': > flash.c:514:24: warning: variable 'l_sect' set but not used > [-Wunused-but-set-variable] > flash.c: In function 'flash_erase_2': > flash.c:956:24: warning: variable 'l_sect' set but not used > [-Wunused-but-set-variable] > > Signed-off-by: Wolfgang Denk <wd@denx.de> > Cc: Stefan Roese <sr@denx.de> > --- > total: 0 errors, 0 warnings, 46 lines checked > NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE > 0003-board-amcc-taihu-flash.c-Fix-GCC-4.6-build-warnings.patch has no obvious style problems and is ready for submission. > > board/amcc/taihu/flash.c | 10 ++-------- > 1 files changed, 2 insertions(+), 8 deletions(-) Applied, thanks. Best regards, Wolfgang Denk
diff --git a/board/amcc/taihu/flash.c b/board/amcc/taihu/flash.c index e9fbbb1..63968a4 100644 --- a/board/amcc/taihu/flash.c +++ b/board/amcc/taihu/flash.c @@ -511,7 +511,7 @@ int flash_erase(flash_info_t * info, int s_first, int s_last) { volatile CONFIG_SYS_FLASH_WORD_SIZE *addr = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[0]); volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2; - int flag, prot, sect, l_sect; + int flag, prot, sect; int i; if ((s_first < 0) || (s_first > s_last)) { @@ -542,8 +542,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(); @@ -569,7 +567,6 @@ int flash_erase(flash_info_t * info, int s_first, int s_last) addr[CONFIG_SYS_FLASH_ADDR1] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x00550055; addr2[0] = (CONFIG_SYS_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 @@ -953,7 +950,7 @@ static int flash_erase_2(flash_info_t * info, int s_first, int s_last) { volatile CONFIG_SYS_FLASH_WORD_SIZE *addr = (CONFIG_SYS_FLASH_WORD_SIZE *) (info->start[0]); volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2; - int flag, prot, sect, l_sect; + int flag, prot, sect; int i; if ((s_first < 0) || (s_first > s_last)) { @@ -984,8 +981,6 @@ static int flash_erase_2(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(); @@ -1011,7 +1006,6 @@ static int flash_erase_2(flash_info_t * info, int s_first, int s_last) addr[CONFIG_SYS_FLASH_CHAR_ADDR1] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x55555555; addr2[0] = (CONFIG_SYS_FLASH_WORD_SIZE) 0x30303030; /* sector erase */ } - l_sect = sect; /* * Wait for each sector to complete, it's more * reliable. According to AMD Spec, you must
Fix: flash.c: In function 'flash_erase_1': flash.c:514:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable] flash.c: In function 'flash_erase_2': flash.c:956:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable] Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefan Roese <sr@denx.de> --- total: 0 errors, 0 warnings, 46 lines checked NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE 0003-board-amcc-taihu-flash.c-Fix-GCC-4.6-build-warnings.patch has no obvious style problems and is ready for submission. board/amcc/taihu/flash.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)