[U-Boot] [PATCH 1/5] GCC4.6: Squash warning in nand_bbt.c
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(-)
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 521ddde..ded652b 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -462,7 +462,7 @@ static int search_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr { struct nand_chip *this = mtd->priv; int i, chips; - int bits, startblock, block, dir; + int startblock, block, dir; int scanlen = mtd->writesize + mtd->oobsize; int bbtblocks; int blocktopage = this->bbt_erase_shift - this->page_shift; @@ -486,9 +486,6 @@ static int search_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr bbtblocks = mtd->size >> this->bbt_erase_shift; }
- /* Number of bits for each erase block in the bbt */ - bits = td->options & NAND_BBT_NRBITS_MSK; - for (i = 0; i < chips; i++) { /* Reset version information */ td->version[i] = 0;
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;
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 ?
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
Acked-by: Mike Frysinger vapier@gentoo.org -mike
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
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); }
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); }
Acked-by: Mike Frysinger vapier@gentoo.org -mike
Acked-by: Mike Frysinger vapier@gentoo.org -mike
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)
Acked-by: Mike Frysinger vapier@gentoo.org -mike
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 */
Acked-by: Mike Frysinger vapier@gentoo.org -mike
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
participants (4)
-
Marek Vasut -
Mike Frysinger -
Scott Wood -
Wolfgang Denk