Patchwork [U-Boot,1/5] GCC4.6: Squash warning in nand_bbt.c

login
register
mail settings
Submitter Marek Vasut
Date Sept. 30, 2011, 10:13 a.m.
Message ID <1317377606-9830-1-git-send-email-marek.vasut@gmail.com>
Download mbox | patch
Permalink /patch/117070/
State Accepted
Commit 89131e90a2ed72e844753f02d079fc99bb859610
Headers show

Comments

Marek Vasut - Sept. 30, 2011, 10:13 a.m.
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(-)
Mike Frysinger - Sept. 30, 2011, 3:57 p.m.
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
Wolfgang Denk - Oct. 1, 2011, 9:28 p.m.
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

Patch

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;