diff mbox

[U-Boot] GCC4.6: Squash warnings in onenand_base.c

Message ID 1334834057-21479-1-git-send-email-wd@denx.de
State Accepted
Commit 1432c763f8d90f468217a6eab6a6b82c262dca3e
Headers show

Commit Message

Wolfgang Denk April 19, 2012, 11:14 a.m. UTC
Fix gcc 4.6 build warnings:
onenand_base.c: In function 'onenand_probe':
onenand_base.c:2577:6: warning: variable 'maf_id' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
---
 drivers/mtd/onenand/onenand_base.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

Comments

Łukasz Majewski April 19, 2012, 11:41 a.m. UTC | #1
Hi Wolfgang,

> Fix gcc 4.6 build warnings:
> onenand_base.c: In function 'onenand_probe':
> onenand_base.c:2577:6: warning: variable 'maf_id' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Lukasz Majewski <l.majewski@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  drivers/mtd/onenand/onenand_base.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mtd/onenand/onenand_base.c
> b/drivers/mtd/onenand/onenand_base.c index 480ae7a..1d0f196 100644
> --- a/drivers/mtd/onenand/onenand_base.c
> +++ b/drivers/mtd/onenand/onenand_base.c
> @@ -2574,7 +2574,7 @@ static int onenand_chip_probe(struct mtd_info
> *mtd) int onenand_probe(struct mtd_info *mtd)
>  {
>  	struct onenand_chip *this = mtd->priv;
> -	int maf_id, dev_id, ver_id;
> +	int dev_id, ver_id;
>  	int density;
>  	int ret;
>  
> @@ -2582,8 +2582,7 @@ int onenand_probe(struct mtd_info *mtd)
>  	if (ret)
>  		return ret;
>  
> -	/* Read manufacturer and device IDs from Register */
> -	maf_id = this->read_word(this->base +
> ONENAND_REG_MANUFACTURER_ID);
> +	/* Read device IDs from Register */
>  	dev_id = this->read_word(this->base + ONENAND_REG_DEVICE_ID);
>  	ver_id = this->read_word(this->base +
> ONENAND_REG_VERSION_ID); this->technology =
> this->read_word(this->base + ONENAND_REG_TECHNOLOGY);

This problem has been already resolved by Anatolij:

http://patchwork.ozlabs.org/patch/152924/

and ready for u-boot inclusion.
Anatolij Gustschin April 19, 2012, 12:06 p.m. UTC | #2
Hi,

On Thu, 19 Apr 2012 13:41:18 +0200
Lukasz Majewski <l.majewski@samsung.com> wrote:
...
> This problem has been already resolved by Anatolij:
> 
> http://patchwork.ozlabs.org/patch/152924/
> 
> and ready for u-boot inclusion.

Wolfgang's patch is better, it additionally fixes the comment.
So it should be applied instead of my patch.

Thanks,
Anatolij
Łukasz Majewski April 19, 2012, 12:38 p.m. UTC | #3
On Thu, 19 Apr 2012 13:14:17 +0200
Wolfgang Denk <wd@denx.de> wrote:

> Fix gcc 4.6 build warnings:
> onenand_base.c: In function 'onenand_probe':
> onenand_base.c:2577:6: warning: variable 'maf_id' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Lukasz Majewski <l.majewski@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  drivers/mtd/onenand/onenand_base.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mtd/onenand/onenand_base.c
> b/drivers/mtd/onenand/onenand_base.c index 480ae7a..1d0f196 100644
> --- a/drivers/mtd/onenand/onenand_base.c
> +++ b/drivers/mtd/onenand/onenand_base.c
> @@ -2574,7 +2574,7 @@ static int onenand_chip_probe(struct mtd_info
> *mtd) int onenand_probe(struct mtd_info *mtd)
>  {
>  	struct onenand_chip *this = mtd->priv;
> -	int maf_id, dev_id, ver_id;
> +	int dev_id, ver_id;
>  	int density;
>  	int ret;
>  
> @@ -2582,8 +2582,7 @@ int onenand_probe(struct mtd_info *mtd)
>  	if (ret)
>  		return ret;
>  
> -	/* Read manufacturer and device IDs from Register */
> -	maf_id = this->read_word(this->base +
> ONENAND_REG_MANUFACTURER_ID);
> +	/* Read device IDs from Register */
>  	dev_id = this->read_word(this->base + ONENAND_REG_DEVICE_ID);
>  	ver_id = this->read_word(this->base +
> ONENAND_REG_VERSION_ID); this->technology =
> this->read_word(this->base + ONENAND_REG_TECHNOLOGY);

Tested-by: Lukasz Majewski <l.majewski@samsung.com>

Will this patch be grabbed by Wolfgang directly and applied to -rc3?
Wolfgang Denk April 19, 2012, 12:41 p.m. UTC | #4
Dear Lukasz,

In message <20120419143837.164bbfed@lmajewski.digital.local> you wrote:
> 
> Tested-by: Lukasz Majewski <l.majewski@samsung.com>

Thanks.

> Will this patch be grabbed by Wolfgang directly and applied to -rc3?

Yes, I will pick it up.

Best regards,

Wolfgang Denk
Wolfgang Denk April 21, 2012, 2:45 p.m. UTC | #5
Dear Wolfgang Denk,

In message <1334834057-21479-1-git-send-email-wd@denx.de> you wrote:
> Fix gcc 4.6 build warnings:
> onenand_base.c: In function 'onenand_probe':
> onenand_base.c:2577:6: warning: variable 'maf_id' set but not used
> [-Wunused-but-set-variable]
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Lukasz Majewski <l.majewski@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  drivers/mtd/onenand/onenand_base.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 480ae7a..1d0f196 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -2574,7 +2574,7 @@  static int onenand_chip_probe(struct mtd_info *mtd)
 int onenand_probe(struct mtd_info *mtd)
 {
 	struct onenand_chip *this = mtd->priv;
-	int maf_id, dev_id, ver_id;
+	int dev_id, ver_id;
 	int density;
 	int ret;
 
@@ -2582,8 +2582,7 @@  int onenand_probe(struct mtd_info *mtd)
 	if (ret)
 		return ret;
 
-	/* Read manufacturer and device IDs from Register */
-	maf_id = this->read_word(this->base + ONENAND_REG_MANUFACTURER_ID);
+	/* Read device IDs from Register */
 	dev_id = this->read_word(this->base + ONENAND_REG_DEVICE_ID);
 	ver_id = this->read_word(this->base + ONENAND_REG_VERSION_ID);
 	this->technology = this->read_word(this->base + ONENAND_REG_TECHNOLOGY);