diff mbox

[U-Boot,08/10] board/mx1ads/syncflash.c: Fix GCC 4.6 warnings

Message ID 1321744338-13207-9-git-send-email-agust@denx.de
State Accepted
Commit 6859ea740e0cb5f96bf3da328e9d4904dc925eae
Headers show

Commit Message

Anatolij Gustschin Nov. 19, 2011, 11:12 p.m. UTC 
Fix:
syncflash.c: In function 'SF_SR':
syncflash.c:60:10: warning: variable 'tmp1' set but not used
[-Wunused-but-set-variable]
syncflash.c: In function 'SF_PrechargeAll':
syncflash.c:96:6: warning: variable 'tmp' set but not used
[-Wunused-but-set-variable]
mx1ads.c: In function 'board_early_init_f':
mx1ads.c:83:24: warning: variable 'tmp' set but not used
[-Wunused-but-set-variable]
syncflash.c: In function 'SF_Erase':
syncflash.c:112:6: warning: variable 'tmp' set but not used
[-Wunused-but-set-variable]
syncflash.c: In function 'flash_init':
syncflash.c:155:6: warning: variable 'tmp' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 board/mx1ads/syncflash.c |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

Comments

Heiko Schocher Nov. 23, 2011, 7:23 a.m. UTC | #1 
Hello Anatolij,

Anatolij Gustschin wrote:
> Fix:
> syncflash.c: In function 'SF_SR':
> syncflash.c:60:10: warning: variable 'tmp1' set but not used
> [-Wunused-but-set-variable]
> syncflash.c: In function 'SF_PrechargeAll':
> syncflash.c:96:6: warning: variable 'tmp' set but not used
> [-Wunused-but-set-variable]
> mx1ads.c: In function 'board_early_init_f':
> mx1ads.c:83:24: warning: variable 'tmp' set but not used
> [-Wunused-but-set-variable]
> syncflash.c: In function 'SF_Erase':
> syncflash.c:112:6: warning: variable 'tmp' set but not used
> [-Wunused-but-set-variable]
> syncflash.c: In function 'flash_init':
> syncflash.c:155:6: warning: variable 'tmp' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  board/mx1ads/syncflash.c |   20 +++++++++-----------
>  1 files changed, 9 insertions(+), 11 deletions(-)

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

Thanks!

bye,
Heiko
diff mbox

Patch

diff --git a/board/mx1ads/syncflash.c b/board/mx1ads/syncflash.c
index 7331efa..61a882e 100644
--- a/board/mx1ads/syncflash.c
+++ b/board/mx1ads/syncflash.c
@@ -57,7 +57,7 @@  flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];	/* info for FLASH chips
 
 /* Get Status register			*/
 u32 SF_SR(void) {
-	u32 tmp,tmp1;
+	u32 tmp;
 
 	reg_SFCTL	= CMD_PROGRAM;
 	tmp		= __REG(CONFIG_SYS_FLASH_BASE);
@@ -65,7 +65,7 @@  u32 SF_SR(void) {
 	reg_SFCTL	= CMD_NORMAL;
 
 	reg_SFCTL	= CMD_LCR;			/* Activate LCR Mode		*/
-	tmp1		= __REG(CONFIG_SYS_FLASH_BASE + LCR_SR_CLEAR);
+	__REG(CONFIG_SYS_FLASH_BASE + LCR_SR_CLEAR);
 
 	return tmp;
 }
@@ -93,10 +93,10 @@  u8 SF_Ready(void) {
 /* Issue the precharge all command		*/
 void SF_PrechargeAll(void) {
 
-	u32 tmp;
-
-	reg_SFCTL	= CMD_PREC;			/* Set Precharge Command	*/
-	tmp		= __REG(CONFIG_SYS_FLASH_BASE + SYNCFLASH_A10); /* Issue Precharge All Command */
+	/* Set Precharge Command	*/
+	reg_SFCTL	= CMD_PREC;
+	/* Issue Precharge All Command */
+	__REG(CONFIG_SYS_FLASH_BASE + SYNCFLASH_A10);
 }
 
 /* set SyncFlash to normal mode			*/
@@ -109,13 +109,12 @@  void SF_Normal(void) {
 
 /* Erase SyncFlash				*/
 void SF_Erase(u32 RowAddress) {
-	u32 tmp;
 
 	reg_SFCTL	= CMD_NORMAL;
-	tmp		= __REG(RowAddress);
+	__REG(RowAddress);
 
 	reg_SFCTL	= CMD_PREC;
-	tmp		= __REG(RowAddress);
+	__REG(RowAddress);
 
 	reg_SFCTL	= CMD_LCR;			/* Set LCR mode		*/
 	__REG(RowAddress + LCR_ERASE_CONFIRM)	= 0;	/* Issue Erase Setup Command	*/
@@ -152,7 +151,6 @@  void SF_NvmodeWrite(void) {
 
 ulong flash_init(void) {
 	int i, j;
-	u32 tmp;
 
 /* Turn on CSD1 for negating RESETSF of SyncFLash */
 
@@ -160,7 +158,7 @@  ulong flash_init(void) {
 	udelay(200);
 
 	reg_SFCTL	= CMD_LMR;		/* Set Load Mode Register Command	*/
-	tmp		= __REG(MODE_REG_VAL);	/* Issue Load Mode Register Command	*/
+	__REG(MODE_REG_VAL);	/* Issue Load Mode Register Command	*/
 
 	SF_Normal();