Skip to contentSkip to conversation

board/xaeniax/flash.c: Fix GCC 4.6 warnings

PATCH New Anatolij Gustschin 2 participants 2 messages Nov 19, 2011 – Nov 23, 2011

lore
Share & tools
lore

Anatolij Gustschin

author
#0 lore raw

PATCH 1/1 board/xaeniax/flash.c: Fix GCC 4.6 warnings

Fix:
flash.c: In function 'flash_erase':
flash.c:223:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable]
flash.c: In function 'write_data':
flash.c:392:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable]

Signed-off-by Anatolij Gustschin <[email protected]>
---
 board/xaeniax/flash.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
board/xaeniax/flash.c +3 -4
index 6cb0aca..836c87e 100644
@@ -220,7 +220,7 @@ static ulong flash_get_size (FPW *addr, flash_info_t *info)
 
 int flash_erase (flash_info_t *info, int s_first, int s_last)
 {
-	int flag, prot, sect;
+	int prot, sect;
 	ulong type, start;
 	int rcode = 0;
 

@@ -255,7 +255,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
 	}
 
 	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
+	disable_interrupts();
 
 	/* Start erase on unprotected sectors */
 	for (sect = s_first; sect <= s_last; sect++) {

@@ -389,7 +389,6 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 {
 	FPWV *addr = (FPWV *) dest;
 	ulong status;
-	int flag;
 	ulong start;
 
 	/* Check if Flash is (sufficiently) erased */

@@ -398,7 +397,7 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 		return (2);
 	}
 	/* Disable interrupts which might cause a timeout here */
-	flag = disable_interrupts ();
+	disable_interrupts();
 
 	*addr = (FPW) 0x00400040;	/* write setup */
 	*addr = data;
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/1 board/xaeniax/flash.c: Fix GCC 4.6 warnings

Hello Anatolij,

Quoted 8 lines · Anatolij Gustschin

Fix:
flash.c: In function 'flash_erase':
flash.c:223:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable]
flash.c: In function 'write_data':
flash.c:392:6: warning: variable 'flag' set but not used [-Wunused-but-set-variable]

Quoted 4 lines
Signed-off-by Anatolij Gustschin <[email protected]>
---
 board/xaeniax/flash.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

Applied to u-boot-staging hs at denx.de

Thanks.

bye,
Heiko