board/amcc/common/flash.c: Fix GCC 4.6 build warning

PATCH New Wolfgang Denk 2 participants 10 messages Nov 17, 2011 – Dec 5, 2011

Share & tools

Wolfgang Denk

author

2011-11-17 19:49 UTC #0 lore raw

PATCH 1/3 board/amcc/common/flash.c: Fix GCC 4.6 build warning

Fix:
In file included from flash.c:45:0:
../common/flash.c: In function 'flash_erase':
../common/flash.c:399:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable]

Signed-off-by Wolfgang Denk <[email protected]>

Cc Stefan Roese <[email protected]>

---
total: 0 errors, 0 warnings, 46 lines checked
NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE 0001-board-amcc-common-flash.c-Fix-GCC-4.6-build-warning.patch has no obvious style problems and is ready for submission.

 board/amcc/common/flash.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

board/amcc/common/flash.c +2 -8

index 8f23375..1960fc1 100644
@@ -396,7 +396,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)) {

@@ -427,8 +427,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();

@@ -454,7 +452,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

@@ -825,7 +822,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)) {

@@ -856,8 +853,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();

@@ -883,7 +878,6 @@ static int flash_erase_2(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

Signature · 1 line

1.7.6.4

Wolfgang Denk

author

2011-12-01 23:08 UTC #1 lore raw

PATCH 1/3 board/amcc/common/flash.c: Fix GCC 4.6 build warning

Dear Stefan,

Quoted 8 lines · In message <[email protected]> I wrote:

Fix:
In file included from flash.c:45:0:
../common/flash.c: In function 'flash_erase':
../common/flash.c:399:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable]
Signed-off-by Wolfgang Denk <[email protected]>
Cc Stefan Roese <[email protected]>

Quoted 7 lines

---
total: 0 errors, 0 warnings, 46 lines checked
NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE 0001-board-amcc-common-flash.c-Fix-GCC-4.6-build-warning.patch has no obvious style problems and is ready for submission.
 board/amcc/common/flash.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

Ping for these patches:

11/17 To:u-boot at lists.d [PATCH 1/3] board/amcc/common/flash.c: Fix GCC 4.6 build warning
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/117300

ID    State        Name
--    -----        ----
126305 New          [U-Boot,1/3] board/amcc/common/flash.c: Fix GCC 4.6 build warning
11/17 To:u-boot at lists.d  [PATCH 2/3] board/amcc/yucca/flash.c: Fix GCC 4.6 build warnings
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/117301
ID    State        Name
--    -----        ----
126306 New          [U-Boot,2/3] board/amcc/yucca/flash.c: Fix GCC 4.6 build warnings
11/17 To:u-boot at lists.d  [PATCH 3/3] board/amcc/taihu/flash.c: Fix GCC 4.6 build warnings
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/117299
ID    State        Name
--    -----        ----

126304 New [U-Boot,3/3] board/amcc/taihu/flash.c: Fix GCC 4.6 build warnings

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I wish I had a bronze torc for every user who didn't read the manual.
                             - Terry Pratchett, _The Light Fantastic_

Wolfgang Denk

author Applied

2011-12-05 22:18 UTC #2 lore raw

PATCH 1/3 board/amcc/common/flash.c: Fix GCC 4.6 build warning

In reply to Wolfgang Denk

Dear Wolfgang Denk,

Quoted 8 lines · In message <[email protected]> you wrote:

Fix:
In file included from flash.c:45:0:
../common/flash.c: In function 'flash_erase':
../common/flash.c:399:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable]
Signed-off-by Wolfgang Denk <[email protected]>
Cc Stefan Roese <[email protected]>

Quoted 7 lines

---
total: 0 errors, 0 warnings, 46 lines checked
NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE 0001-board-amcc-common-flash.c-Fix-GCC-4.6-build-warning.patch has no obvious style problems and is ready for submission.
 board/amcc/common/flash.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

Applied, thanks.

Stefan, hope this is OK with you.

Best regards,

Wolfgang Denk

Signature · 4 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"It's like deja vu all over again."                      - Yogi Berra

Wolfgang Denk

author

2011-11-17 19:50 UTC #3 lore raw

PATCH 2/3 board/amcc/yucca/flash.c: Fix GCC 4.6 build warnings

In reply to Wolfgang Denk

Fix:
flash.c: In function 'flash_erase_1':
flash.c:425:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable]
flash.c: In function 'flash_erase_2':
flash.c:834:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable]

Signed-off-by Wolfgang Denk <[email protected]>

Cc Stefan Roese <[email protected]>

---
total: 0 errors, 0 warnings, 46 lines checked
NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE 0002-board-amcc-yucca-flash.c-Fix-GCC-4.6-build-warnings.patch has no obvious style problems and is ready for submission.

 board/amcc/yucca/flash.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

board/amcc/yucca/flash.c +2 -8

index 20b6af9..ab513f9 100644
@@ -422,7 +422,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)) {

@@ -449,8 +449,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();

@@ -476,7 +474,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

@@ -831,7 +828,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)) {

@@ -858,8 +855,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();

@@ -885,7 +880,6 @@ static int flash_erase_2(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

Signature · 1 line

1.7.6.4

Stefan Roese

2011-12-02 07:16 UTC #4 lore raw

PATCH 2/3 board/amcc/yucca/flash.c: Fix GCC 4.6 build warnings

Quoted 10 lines · On Thursday 17 November 2011 20:50:00 Wolfgang Denk wrote:

Fix:
flash.c: In function 'flash_erase_1':
flash.c:425:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable]
flash.c: In function 'flash_erase_2':
flash.c:834:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable]
Signed-off-by Wolfgang Denk <[email protected]>
Cc Stefan Roese <[email protected]>

Thanks.

Acked-by Stefan Roese <[email protected]>

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 at denx.de

Wolfgang Denk

author Applied

2011-12-05 22:18 UTC #5 lore raw

PATCH 2/3 board/amcc/yucca/flash.c: Fix GCC 4.6 build warnings

In reply to Wolfgang Denk

Dear Wolfgang Denk,

Quoted 10 lines · In message <[email protected]> you wrote:

Fix:
flash.c: In function 'flash_erase_1':
flash.c:425:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable]
flash.c: In function 'flash_erase_2':
flash.c:834:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable]
Signed-off-by Wolfgang Denk <[email protected]>
Cc Stefan Roese <[email protected]>

Quoted 7 lines

---
total: 0 errors, 0 warnings, 46 lines checked
NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE 0002-board-amcc-yucca-flash.c-Fix-GCC-4.6-build-warnings.patch has no obvious style problems and is ready for submission.
 board/amcc/yucca/flash.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
You can fool some of the people all of the time, and You can fool all
of the people some of the time, but You can't fool mom.

Stefan Roese

2011-12-02 07:15 UTC #6 lore raw

PATCH 1/3 board/amcc/common/flash.c: Fix GCC 4.6 build warning

In reply to Wolfgang Denk

Quoted 8 lines · On Thursday 17 November 2011 20:49:59 Wolfgang Denk wrote:

Fix:
In file included from flash.c:45:0:
../common/flash.c: In function 'flash_erase':
../common/flash.c:399:24: warning: variable 'l_sect' set but not used [-Wunused-but-set-variable]
Signed-off-by Wolfgang Denk <[email protected]>
Cc Stefan Roese <[email protected]>

Thanks.

Acked-by Stefan Roese <[email protected]>

Best regards,
Stefan

Wolfgang Denk

author

2011-11-17 19:50 UTC #7 lore raw

PATCH 3/3 board/amcc/taihu/flash.c: Fix GCC 4.6 build warnings

In reply to Wolfgang Denk

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 <[email protected]>

Cc Stefan Roese <[email protected]>

---
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(-)

board/amcc/taihu/flash.c +2 -8

index e9fbbb1..63968a4 100644
@@ -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

Signature · 1 line

1.7.6.4

Stefan Roese

2011-12-02 07:16 UTC #8 lore raw

PATCH 3/3 board/amcc/taihu/flash.c: Fix GCC 4.6 build warnings

Quoted 10 lines · 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 <[email protected]>
Cc Stefan Roese <[email protected]>

Thanks.

Acked-by Stefan Roese <[email protected]>

Best regards,
Stefan

Wolfgang Denk

author Applied

2011-12-05 22:18 UTC #9 lore raw

PATCH 3/3 board/amcc/taihu/flash.c: Fix GCC 4.6 build warnings

In reply to Wolfgang Denk

Dear Wolfgang Denk,

Quoted 10 lines · In message <[email protected]> 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 <[email protected]>
Cc Stefan Roese <[email protected]>

Quoted 7 lines

---
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

Signature · 6 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
C++ was an interesting and valuable experiment, but we've learned its
lessons and it's time to move on.
                            - Peter Curran in <[email protected]>