diff mbox

[U-Boot,2/9] drivers/mtd/nand/nand_spl_simple.c: Fix GCC 4.6 warnings

Message ID 1322930775-4767-2-git-send-email-agust@denx.de
State Accepted
Delegated to: Scott Wood
Headers show

Commit Message

Anatolij Gustschin Dec. 3, 2011, 4:46 p.m. UTC
Fix warnings for both cases:

definded CONFIG_SYS_NAND_HW_ECC_OOBFIRST:
nand_spl_simple.c: In function 'nand_read_page':
nand_spl_simple.c:156:6: warning: variable 'stat' set but not used
[-Wunused-but-set-variable]

not definded CONFIG_SYS_NAND_HW_ECC_OOBFIRST:
nand_spl_simple.c: In function 'nand_read_page':
nand_spl_simple.c:196:6: warning: variable 'stat' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
---
 drivers/mtd/nand/nand_spl_simple.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Comments

Heiko Schocher Dec. 4, 2011, 9:07 a.m. UTC | #1
Hello Anatolij,

Anatolij Gustschin wrote:
> Fix warnings for both cases:
> 
> definded CONFIG_SYS_NAND_HW_ECC_OOBFIRST:
> nand_spl_simple.c: In function 'nand_read_page':
> nand_spl_simple.c:156:6: warning: variable 'stat' set but not used
> [-Wunused-but-set-variable]
> 
> not definded CONFIG_SYS_NAND_HW_ECC_OOBFIRST:
> nand_spl_simple.c: In function 'nand_read_page':
> nand_spl_simple.c:196:6: warning: variable 'stat' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Scott Wood <scottwood@freescale.com>
> ---
>  drivers/mtd/nand/nand_spl_simple.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)

Thanks!

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
Marek Vasut Dec. 4, 2011, 11:24 a.m. UTC | #2
> Fix warnings for both cases:
> 
> definded CONFIG_SYS_NAND_HW_ECC_OOBFIRST:
> nand_spl_simple.c: In function 'nand_read_page':
> nand_spl_simple.c:156:6: warning: variable 'stat' set but not used
> [-Wunused-but-set-variable]
> 
> not definded CONFIG_SYS_NAND_HW_ECC_OOBFIRST:
> nand_spl_simple.c: In function 'nand_read_page':
> nand_spl_simple.c:196:6: warning: variable 'stat' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Scott Wood <scottwood@freescale.com>
> ---
>  drivers/mtd/nand/nand_spl_simple.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mtd/nand/nand_spl_simple.c
> b/drivers/mtd/nand/nand_spl_simple.c index ed821f2..7eb08a3 100644
> --- a/drivers/mtd/nand/nand_spl_simple.c
> +++ b/drivers/mtd/nand/nand_spl_simple.c
> @@ -153,7 +153,6 @@ static int nand_read_page(int block, int page, uchar
> *dst) int eccbytes = CONFIG_SYS_NAND_ECCBYTES;
>  	int eccsteps = CONFIG_SYS_NAND_ECCSTEPS;
>  	uint8_t *p = dst;
> -	int stat;
> 
>  	/*
>  	 * No malloc available for now, just use some temporary locations
> @@ -176,7 +175,7 @@ static int nand_read_page(int block, int page, uchar
> *dst) this->ecc.hwctl(&mtd, NAND_ECC_READ);
>  		this->read_buf(&mtd, p, eccsize);
>  		this->ecc.calculate(&mtd, p, &ecc_calc[i]);
> -		stat = this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]);
> +		this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]);
>  	}
> 
>  	return 0;
> @@ -193,7 +192,6 @@ static int nand_read_page(int block, int page, void
> *dst) int eccbytes = CONFIG_SYS_NAND_ECCBYTES;
>  	int eccsteps = CONFIG_SYS_NAND_ECCSTEPS;
>  	uint8_t *p = dst;
> -	int stat;
> 
>  	nand_command(block, page, 0, NAND_CMD_READ0);
> 
> @@ -224,7 +222,7 @@ static int nand_read_page(int block, int page, void
> *dst) * from correct_data(). We just hope that all possible errors
>  		 * are corrected by this routine.
>  		 */
> -		stat = this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]);
> +		this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]);
>  	}
> 
>  	return 0;

Acked-by: Marek Vasut <marek.vasut@gmail.com>
Scott Wood Dec. 7, 2011, 10:10 p.m. UTC | #3
On 12/03/2011 10:46 AM, Anatolij Gustschin wrote:
> Fix warnings for both cases:
> 
> definded CONFIG_SYS_NAND_HW_ECC_OOBFIRST:
> nand_spl_simple.c: In function 'nand_read_page':
> nand_spl_simple.c:156:6: warning: variable 'stat' set but not used
> [-Wunused-but-set-variable]
> 
> not definded CONFIG_SYS_NAND_HW_ECC_OOBFIRST:
> nand_spl_simple.c: In function 'nand_read_page':
> nand_spl_simple.c:196:6: warning: variable 'stat' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Scott Wood <scottwood@freescale.com>
> ---
>  drivers/mtd/nand/nand_spl_simple.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)

Applied to u-boot-nand-flash

-Scott
diff mbox

Patch

diff --git a/drivers/mtd/nand/nand_spl_simple.c b/drivers/mtd/nand/nand_spl_simple.c
index ed821f2..7eb08a3 100644
--- a/drivers/mtd/nand/nand_spl_simple.c
+++ b/drivers/mtd/nand/nand_spl_simple.c
@@ -153,7 +153,6 @@  static int nand_read_page(int block, int page, uchar *dst)
 	int eccbytes = CONFIG_SYS_NAND_ECCBYTES;
 	int eccsteps = CONFIG_SYS_NAND_ECCSTEPS;
 	uint8_t *p = dst;
-	int stat;
 
 	/*
 	 * No malloc available for now, just use some temporary locations
@@ -176,7 +175,7 @@  static int nand_read_page(int block, int page, uchar *dst)
 		this->ecc.hwctl(&mtd, NAND_ECC_READ);
 		this->read_buf(&mtd, p, eccsize);
 		this->ecc.calculate(&mtd, p, &ecc_calc[i]);
-		stat = this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]);
+		this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]);
 	}
 
 	return 0;
@@ -193,7 +192,6 @@  static int nand_read_page(int block, int page, void *dst)
 	int eccbytes = CONFIG_SYS_NAND_ECCBYTES;
 	int eccsteps = CONFIG_SYS_NAND_ECCSTEPS;
 	uint8_t *p = dst;
-	int stat;
 
 	nand_command(block, page, 0, NAND_CMD_READ0);
 
@@ -224,7 +222,7 @@  static int nand_read_page(int block, int page, void *dst)
 		 * from correct_data(). We just hope that all possible errors
 		 * are corrected by this routine.
 		 */
-		stat = this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]);
+		this->ecc.correct(&mtd, p, &ecc_code[i], &ecc_calc[i]);
 	}
 
 	return 0;