* [U-Boot] [PATCH] GCC4.6: Squash warnings in onenand_base.c
@ 2012-04-19 11:14 Wolfgang Denk
2012-04-19 11:41 ` Lukasz Majewski
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Wolfgang Denk @ 2012-04-19 11:14 UTC (permalink / raw)
To: u-boot
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);
--
1.7.7.6
^ permalink raw reply related [flat|nested] 7+ messages in thread* [U-Boot] [PATCH] GCC4.6: Squash warnings in onenand_base.c
2012-04-19 11:14 [U-Boot] [PATCH] GCC4.6: Squash warnings in onenand_base.c Wolfgang Denk
@ 2012-04-19 11:41 ` Lukasz Majewski
2012-04-19 12:06 ` Anatolij Gustschin
2012-04-19 12:38 ` Lukasz Majewski
2012-04-21 14:45 ` Wolfgang Denk
2 siblings, 1 reply; 7+ messages in thread
From: Lukasz Majewski @ 2012-04-19 11:41 UTC (permalink / raw)
To: u-boot
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.
--
Best regards,
Lukasz Majewski
Samsung Poland R&D Center
Platform Group
^ permalink raw reply [flat|nested] 7+ messages in thread* [U-Boot] [PATCH] GCC4.6: Squash warnings in onenand_base.c
2012-04-19 11:14 [U-Boot] [PATCH] GCC4.6: Squash warnings in onenand_base.c Wolfgang Denk
2012-04-19 11:41 ` Lukasz Majewski
@ 2012-04-19 12:38 ` Lukasz Majewski
2012-04-19 12:41 ` Wolfgang Denk
2012-04-21 14:45 ` Wolfgang Denk
2 siblings, 1 reply; 7+ messages in thread
From: Lukasz Majewski @ 2012-04-19 12:38 UTC (permalink / raw)
To: u-boot
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?
--
Best regards,
Lukasz Majewski
Samsung Poland R&D Center
Platform Group
^ permalink raw reply [flat|nested] 7+ messages in thread* [U-Boot] [PATCH] GCC4.6: Squash warnings in onenand_base.c
2012-04-19 12:38 ` Lukasz Majewski
@ 2012-04-19 12:41 ` Wolfgang Denk
0 siblings, 0 replies; 7+ messages in thread
From: Wolfgang Denk @ 2012-04-19 12:41 UTC (permalink / raw)
To: u-boot
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
--
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
A wise person makes his own decisions, a weak one obeys public
opinion. -- Chinese proverb
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH] GCC4.6: Squash warnings in onenand_base.c
2012-04-19 11:14 [U-Boot] [PATCH] GCC4.6: Squash warnings in onenand_base.c Wolfgang Denk
2012-04-19 11:41 ` Lukasz Majewski
2012-04-19 12:38 ` Lukasz Majewski
@ 2012-04-21 14:45 ` Wolfgang Denk
2 siblings, 0 replies; 7+ messages in thread
From: Wolfgang Denk @ 2012-04-21 14:45 UTC (permalink / raw)
To: u-boot
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
--
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
Technology is dominated by those who manage what they do not under-
stand.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [U-Boot] [PATCH] GCC4.6: Squash warnings in onenand_base.c
@ 2011-11-06 0:01 Marek Vasut
0 siblings, 0 replies; 7+ messages in thread
From: Marek Vasut @ 2011-11-06 0:01 UTC (permalink / raw)
To: u-boot
onenand_base.c: In function ?onenand_do_lock_cmd?:
onenand_base.c:1946:6: warning: variable ?wp_status_mask? set but not used
[-Wunused-but-set-variable]
onenand_base.c: In function ?onenand_check_maf?:
onenand_base.c:2229:8: warning: variable ?name? set but not used
[-Wunused-but-set-variable]
onenand_base.c: In function ?flexonenand_get_boundary?:
onenand_base.c:2258:6: warning: variable ?ret? set but not used
[-Wunused-but-set-variable]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/mtd/onenand/onenand_base.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 24e02c2..06f187f 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1943,16 +1943,10 @@ static int onenand_do_lock_cmd(struct mtd_info *mtd, loff_t ofs, size_t len, int
{
struct onenand_chip *this = mtd->priv;
int start, end, block, value, status;
- int wp_status_mask;
start = onenand_block(this, ofs);
end = onenand_block(this, ofs + len);
- if (cmd == ONENAND_CMD_LOCK)
- wp_status_mask = ONENAND_WP_LS;
- else
- wp_status_mask = ONENAND_WP_US;
-
/* Continuous lock scheme */
if (this->options & ONENAND_HAS_CONT_LOCK) {
/* Set start block address */
@@ -2226,19 +2220,21 @@ static const struct onenand_manufacturers onenand_manuf_ids[] = {
static int onenand_check_maf(int manuf)
{
int size = ARRAY_SIZE(onenand_manuf_ids);
- char *name;
int i;
+#ifdef ONENAND_DEBUG
+ char *name;
+#endif
for (i = 0; i < size; i++)
if (manuf == onenand_manuf_ids[i].id)
break;
+#ifdef ONENAND_DEBUG
if (i < size)
name = onenand_manuf_ids[i].name;
else
name = "Unknown";
-#ifdef ONENAND_DEBUG
printk(KERN_DEBUG "OneNAND Manufacturer: %s (0x%0x)\n", name, manuf);
#endif
@@ -2255,7 +2251,7 @@ static int flexonenand_get_boundary(struct mtd_info *mtd)
{
struct onenand_chip *this = mtd->priv;
unsigned int die, bdry;
- int ret, syscfg, locked;
+ int syscfg, locked;
/* Disable ECC */
syscfg = this->read_word(this->base + ONENAND_REG_SYS_CFG1);
@@ -2266,7 +2262,7 @@ static int flexonenand_get_boundary(struct mtd_info *mtd)
this->wait(mtd, FL_SYNCING);
this->command(mtd, FLEXONENAND_CMD_READ_PI, die, 0);
- ret = this->wait(mtd, FL_READING);
+ this->wait(mtd, FL_READING);
bdry = this->read_word(this->base + ONENAND_DATARAM);
if ((bdry >> FLEXONENAND_PI_UNLOCK_SHIFT) == 3)
@@ -2276,7 +2272,7 @@ static int flexonenand_get_boundary(struct mtd_info *mtd)
this->boundary[die] = bdry & FLEXONENAND_PI_MASK;
this->command(mtd, ONENAND_CMD_RESET, 0, 0);
- ret = this->wait(mtd, FL_RESETING);
+ this->wait(mtd, FL_RESETING);
printk(KERN_INFO "Die %d boundary: %d%s\n", die,
this->boundary[die], locked ? "(Locked)" : "(Unlocked)");
--
1.7.6.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-04-21 14:45 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-19 11:14 [U-Boot] [PATCH] GCC4.6: Squash warnings in onenand_base.c Wolfgang Denk
2012-04-19 11:41 ` Lukasz Majewski
2012-04-19 12:06 ` Anatolij Gustschin
2012-04-19 12:38 ` Lukasz Majewski
2012-04-19 12:41 ` Wolfgang Denk
2012-04-21 14:45 ` Wolfgang Denk
-- strict thread matches above, loose matches on Subject: below --
2011-11-06 0:01 Marek Vasut
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.