Skip to contentSkip to conversation

NAND: davinci: Fix warnings when 4-bit ECC not used

PATCH New Scott Wood 1 participant 1 message Sep 28, 2009

Subsystems (2)
lore
Share & tools
lore

Scott Wood

author
#0 lore raw

PATCH 1/1 NAND: davinci: Fix warnings when 4-bit ECC not used

I accidentally left v2 of "NAND: DaVinci:Adding 4 BIT ECC support" applied when I pushed the tree last merge window, and missed these fixes which were in v3 of that patch.

---
Applied to u-boot-nand-flash

 drivers/mtd/nand/davinci_nand.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/mtd/nand/davinci_nand.c +1 -2
index 37d8b73..eabaf3e 100644
@@ -202,7 +202,6 @@ static struct nand_ecclayout nand_davinci_4bit_layout_oobfirst = {
 	},
 #endif
 };
-#endif
 
 static void nand_davinci_4bit_enable_hwecc(struct mtd_info *mtd, int mode)
 {
@@ -289,7 +288,6 @@ static int nand_davinci_4bit_calculate_ecc(struct mtd_info *mtd,
 static int nand_davinci_4bit_correct_data(struct mtd_info *mtd, uint8_t *dat,
 					  uint8_t *read_ecc, uint8_t *calc_ecc)
 {
-	struct nand_chip *this = mtd->priv;
 	unsigned short ecc_10bit[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 	int i;
 	unsigned int hw_4ecc[4] = { 0, 0, 0, 0 }, iserror = 0;
@@ -441,6 +439,7 @@ static int nand_davinci_4bit_correct_data(struct mtd_info *mtd, uint8_t *dat,
 
 	return numerrors;
 }
+#endif /* CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST */
 
 static int nand_davinci_dev_ready(struct mtd_info *mtd)
 {
Signature · 1 line
1.6.4.1.184.g2e117