* [U-Boot] [PATCH 2/5] GCC4,6: Squash warning in cmd_nand.c
2011-09-30 10:13 [U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c Marek Vasut
@ 2011-09-30 10:13 ` Marek Vasut
2011-09-30 10:14 ` Marek Vasut
` (2 more replies)
2011-09-30 10:13 ` [U-Boot] [PATCH 3/5] GCC4.6: Squash warning in vmt.c Marek Vasut
` (4 subsequent siblings)
5 siblings, 3 replies; 16+ messages in thread
From: Marek Vasut @ 2011-09-30 10:13 UTC (permalink / raw)
To: u-boot
cmd_nand.c: In function ?do_nand?:
cmd_nand.c:490:7: warning: variable ?chip? set but not used
[-Wunused-but-set-variable]
cmd_nand.c:489:7: warning: variable ?part? set but not used
[-Wunused-but-set-variable]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Scott Wood <scottwood@freescale.com>
---
common/cmd_nand.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index f42ea5b..3e12a36 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -486,8 +486,6 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
int scrub_yes = argc > 2 && !strcmp("-y", argv[2]);
int o = (clean || scrub_yes) ? 3 : 2;
int scrub = !strncmp(cmd, "scrub", 5);
- int part = 0;
- int chip = 0;
int spread = 0;
int args = 2;
const char *scrub_warn =
@@ -505,10 +503,8 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
if (!strcmp(&cmd[5], ".spread")) {
spread = 1;
} else if (!strcmp(&cmd[5], ".part")) {
- part = 1;
args = 1;
} else if (!strcmp(&cmd[5], ".chip")) {
- chip = 1;
args = 0;
} else {
goto usage;
--
1.7.5.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [U-Boot] [PATCH 2/5] GCC4,6: Squash warning in cmd_nand.c
2011-09-30 10:13 ` [U-Boot] [PATCH 2/5] GCC4,6: Squash warning in cmd_nand.c Marek Vasut
@ 2011-09-30 10:14 ` Marek Vasut
2011-10-03 16:22 ` Scott Wood
2011-09-30 15:57 ` Mike Frysinger
2011-10-01 21:31 ` Wolfgang Denk
2 siblings, 1 reply; 16+ messages in thread
From: Marek Vasut @ 2011-09-30 10:14 UTC (permalink / raw)
To: u-boot
On Friday, September 30, 2011 12:13:23 PM Marek Vasut wrote:
> cmd_nand.c: In function ?do_nand?:
> cmd_nand.c:490:7: warning: variable ?chip? set but not used
> [-Wunused-but-set-variable]
> cmd_nand.c:489:7: warning: variable ?part? set but not used
> [-Wunused-but-set-variable]
>
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Scott Wood <scottwood@freescale.com>
> ---
> common/cmd_nand.c | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
This even looks like .part and .chip has no effect at all ... am I right ?
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 2/5] GCC4,6: Squash warning in cmd_nand.c
2011-09-30 10:14 ` Marek Vasut
@ 2011-10-03 16:22 ` Scott Wood
0 siblings, 0 replies; 16+ messages in thread
From: Scott Wood @ 2011-10-03 16:22 UTC (permalink / raw)
To: u-boot
On 09/30/2011 05:14 AM, Marek Vasut wrote:
> On Friday, September 30, 2011 12:13:23 PM Marek Vasut wrote:
>> cmd_nand.c: In function ?do_nand?:
>> cmd_nand.c:490:7: warning: variable ?chip? set but not used
>> [-Wunused-but-set-variable]
>> cmd_nand.c:489:7: warning: variable ?part? set but not used
>> [-Wunused-but-set-variable]
>>
>> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
>> Cc: Scott Wood <scottwood@freescale.com>
>> ---
>> common/cmd_nand.c | 4 ----
>> 1 files changed, 0 insertions(+), 4 deletions(-)
>>
>
> This even looks like .part and .chip has no effect at all ... am I right ?
They affect error checking. Beyond that, the code can tell what to do
from the number of arguments. The idea was that accidentally leaving
out an argument (such as by a misspelled $varaible) shouldn't end up
erasing more than you expected.
-Scott
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 2/5] GCC4,6: Squash warning in cmd_nand.c
2011-09-30 10:13 ` [U-Boot] [PATCH 2/5] GCC4,6: Squash warning in cmd_nand.c Marek Vasut
2011-09-30 10:14 ` Marek Vasut
@ 2011-09-30 15:57 ` Mike Frysinger
2011-10-01 21:31 ` Wolfgang Denk
2 siblings, 0 replies; 16+ messages in thread
From: Mike Frysinger @ 2011-09-30 15:57 UTC (permalink / raw)
To: u-boot
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 2/5] GCC4,6: Squash warning in cmd_nand.c
2011-09-30 10:13 ` [U-Boot] [PATCH 2/5] GCC4,6: Squash warning in cmd_nand.c Marek Vasut
2011-09-30 10:14 ` Marek Vasut
2011-09-30 15:57 ` Mike Frysinger
@ 2011-10-01 21:31 ` Wolfgang Denk
2 siblings, 0 replies; 16+ messages in thread
From: Wolfgang Denk @ 2011-10-01 21:31 UTC (permalink / raw)
To: u-boot
Dear Marek Vasut,
In message <1317377606-9830-2-git-send-email-marek.vasut@gmail.com> you wrote:
> cmd_nand.c: In function `do_nand?:
> cmd_nand.c:490:7: warning: variable `chip? set but not used
> [-Wunused-but-set-variable]
> cmd_nand.c:489:7: warning: variable `part? set but not used
> [-Wunused-but-set-variable]
>
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Scott Wood <scottwood@freescale.com>
> ---
> common/cmd_nand.c | 4 ----
> 1 files changed, 0 insertions(+), 4 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
There is an order of things in this universe.
-- Apollo, "Who Mourns for Adonais?" stardate 3468.1
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 3/5] GCC4.6: Squash warning in vmt.c
2011-09-30 10:13 [U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c Marek Vasut
2011-09-30 10:13 ` [U-Boot] [PATCH 2/5] GCC4,6: Squash warning in cmd_nand.c Marek Vasut
@ 2011-09-30 10:13 ` Marek Vasut
2011-09-30 10:19 ` [U-Boot] [PATCH 3/5 V2] " Marek Vasut
2011-09-30 15:57 ` [U-Boot] [PATCH 3/5] " Mike Frysinger
2011-09-30 10:13 ` [U-Boot] [PATCH 4/5] GCC4.6: Squash warning in cmd_ubi.c: Marek Vasut
` (3 subsequent siblings)
5 siblings, 2 replies; 16+ messages in thread
From: Marek Vasut @ 2011-09-30 10:13 UTC (permalink / raw)
To: u-boot
vmt.c: In function ?ubi_free_volume?:
vmt.c:681:6: warning: variable ?err? set but not used
[-Wunused-but-set-variable]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
drivers/mtd/ubi/vmt.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 061da64..ce9fec7 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -678,12 +678,10 @@ out_cdev:
*/
void ubi_free_volume(struct ubi_device *ubi, struct ubi_volume *vol)
{
- int err;
-
dbg_msg("free volume %d", vol->vol_id);
ubi->volumes[vol->vol_id] = NULL;
- err = ubi_destroy_gluebi(vol);
+ ubi_destroy_gluebi(vol);
cdev_del(&vol->cdev);
volume_sysfs_close(vol);
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [U-Boot] [PATCH 3/5 V2] GCC4.6: Squash warning in vmt.c
2011-09-30 10:13 ` [U-Boot] [PATCH 3/5] GCC4.6: Squash warning in vmt.c Marek Vasut
@ 2011-09-30 10:19 ` Marek Vasut
2011-09-30 15:57 ` Mike Frysinger
2011-09-30 15:57 ` [U-Boot] [PATCH 3/5] " Mike Frysinger
1 sibling, 1 reply; 16+ messages in thread
From: Marek Vasut @ 2011-09-30 10:19 UTC (permalink / raw)
To: u-boot
vmt.c: In function ?ubi_free_volume?:
vmt.c:681:6: warning: variable ?err? set but not used
[-Wunused-but-set-variable]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
drivers/mtd/ubi/ubi.h | 7 ++++++-
drivers/mtd/ubi/vmt.c | 4 +---
2 files changed, 7 insertions(+), 4 deletions(-)
V2: Convert ubi_destroy_gluebi() to inline fn
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index bf77a15..14c3a5f 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -467,7 +467,12 @@ int ubi_destroy_gluebi(struct ubi_volume *vol);
void ubi_gluebi_updated(struct ubi_volume *vol);
#else
#define ubi_create_gluebi(ubi, vol) 0
-#define ubi_destroy_gluebi(vol) 0
+
+static inline int ubi_destroy_gluebi(struct ubi_volume *vol)
+{
+ return 0;
+}
+
#define ubi_gluebi_updated(vol)
#endif
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 061da64..ce9fec7 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -678,12 +678,10 @@ out_cdev:
*/
void ubi_free_volume(struct ubi_device *ubi, struct ubi_volume *vol)
{
- int err;
-
dbg_msg("free volume %d", vol->vol_id);
ubi->volumes[vol->vol_id] = NULL;
- err = ubi_destroy_gluebi(vol);
+ ubi_destroy_gluebi(vol);
cdev_del(&vol->cdev);
volume_sysfs_close(vol);
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [U-Boot] [PATCH 3/5] GCC4.6: Squash warning in vmt.c
2011-09-30 10:13 ` [U-Boot] [PATCH 3/5] GCC4.6: Squash warning in vmt.c Marek Vasut
2011-09-30 10:19 ` [U-Boot] [PATCH 3/5 V2] " Marek Vasut
@ 2011-09-30 15:57 ` Mike Frysinger
1 sibling, 0 replies; 16+ messages in thread
From: Mike Frysinger @ 2011-09-30 15:57 UTC (permalink / raw)
To: u-boot
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH 4/5] GCC4.6: Squash warning in cmd_ubi.c:
2011-09-30 10:13 [U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c Marek Vasut
2011-09-30 10:13 ` [U-Boot] [PATCH 2/5] GCC4,6: Squash warning in cmd_nand.c Marek Vasut
2011-09-30 10:13 ` [U-Boot] [PATCH 3/5] GCC4.6: Squash warning in vmt.c Marek Vasut
@ 2011-09-30 10:13 ` Marek Vasut
2011-09-30 15:54 ` Mike Frysinger
2011-09-30 10:13 ` [U-Boot] [PATCH 5/5] GCC4.6: Squash warning in lzo1x_decompress.c Marek Vasut
` (2 subsequent siblings)
5 siblings, 1 reply; 16+ messages in thread
From: Marek Vasut @ 2011-09-30 10:13 UTC (permalink / raw)
To: u-boot
cmd_ubi.c: In function ?ubi_volume_read?:
cmd_ubi.c:319:9: warning: variable ?count_save? set but not used
[-Wunused-but-set-variable]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
common/cmd_ubi.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c
index 629758f..8c1bc23 100644
--- a/common/cmd_ubi.c
+++ b/common/cmd_ubi.c
@@ -316,7 +316,6 @@ static int ubi_volume_write(char *volume, void *buf, size_t size)
static int ubi_volume_read(char *volume, char *buf, size_t size)
{
int err, lnum, off, len, tbuf_size;
- size_t count_save = size;
void *tbuf;
unsigned long long tmp;
struct ubi_volume *vol;
@@ -347,7 +346,7 @@ static int ubi_volume_read(char *volume, char *buf, size_t size)
if (vol->corrupted)
printf("read from corrupted volume %d", vol->vol_id);
if (offp + size > vol->used_bytes)
- count_save = size = vol->used_bytes - offp;
+ size = vol->used_bytes - offp;
tbuf_size = vol->usable_leb_size;
if (size < tbuf_size)
--
1.7.5.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [U-Boot] [PATCH 5/5] GCC4.6: Squash warning in lzo1x_decompress.c
2011-09-30 10:13 [U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c Marek Vasut
` (2 preceding siblings ...)
2011-09-30 10:13 ` [U-Boot] [PATCH 4/5] GCC4.6: Squash warning in cmd_ubi.c: Marek Vasut
@ 2011-09-30 10:13 ` Marek Vasut
2011-09-30 15:56 ` Mike Frysinger
2011-09-30 15:57 ` [U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c Mike Frysinger
2011-10-01 21:28 ` Wolfgang Denk
5 siblings, 1 reply; 16+ messages in thread
From: Marek Vasut @ 2011-09-30 10:13 UTC (permalink / raw)
To: u-boot
lzo1x_decompress.c: In function ?parse_header?:
lzo1x_decompress.c:35:5: warning: variable ?level? set but not used
[-Wunused-but-set-variable]
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
lib/lzo/lzo1x_decompress.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c
index 09bdc8f..e6ff708 100644
--- a/lib/lzo/lzo1x_decompress.c
+++ b/lib/lzo/lzo1x_decompress.c
@@ -32,7 +32,6 @@ static const unsigned char lzop_magic[] = {
static inline const unsigned char *parse_header(const unsigned char *src)
{
- u8 level = 0;
u16 version;
int i;
@@ -47,7 +46,7 @@ static inline const unsigned char *parse_header(const unsigned char *src)
version = get_unaligned_be16(src);
src += 7;
if (version >= 0x0940)
- level = *src++;
+ src++;
if (get_unaligned_be32(src) & HEADER_HAS_FILTER)
src += 4; /* filter info */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c
2011-09-30 10:13 [U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c Marek Vasut
` (3 preceding siblings ...)
2011-09-30 10:13 ` [U-Boot] [PATCH 5/5] GCC4.6: Squash warning in lzo1x_decompress.c Marek Vasut
@ 2011-09-30 15:57 ` Mike Frysinger
2011-10-01 21:28 ` Wolfgang Denk
5 siblings, 0 replies; 16+ messages in thread
From: Mike Frysinger @ 2011-09-30 15:57 UTC (permalink / raw)
To: u-boot
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
^ permalink raw reply [flat|nested] 16+ messages in thread* [U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c
2011-09-30 10:13 [U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c Marek Vasut
` (4 preceding siblings ...)
2011-09-30 15:57 ` [U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c Mike Frysinger
@ 2011-10-01 21:28 ` Wolfgang Denk
5 siblings, 0 replies; 16+ messages in thread
From: Wolfgang Denk @ 2011-10-01 21:28 UTC (permalink / raw)
To: u-boot
Dear Marek Vasut,
In message <1317377606-9830-1-git-send-email-marek.vasut@gmail.com> you wrote:
> nand_bbt.c: In function `search_bbt?:
> nand_bbt.c:465:6: warning: variable `bits? set but not used
> [-Wunused-but-set-variable]
>
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Scott Wood <scottwood@freescale.com>
> ---
> drivers/mtd/nand/nand_bbt.c | 5 +----
> 1 files changed, 1 insertions(+), 4 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
When a program is being tested, it is too late to make design
changes. -- Geoffrey James, "The Tao of Programming"
^ permalink raw reply [flat|nested] 16+ messages in thread