NAND: davinci: Fix warnings when 4-bit ECC not used
authorScott Wood <scottwood@freescale.com>
Mon, 28 Sep 2009 21:33:18 +0000 (16:33 -0500)
committerScott Wood <scottwood@freescale.com>
Mon, 28 Sep 2009 21:33:18 +0000 (16:33 -0500)
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.

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
drivers/mtd/nand/davinci_nand.c

index 37d8b7312cf96d172b4132cb8b3f8db8ec5879b4..eabaf3e773f63d8e14d46694e1a57fd394437428 100644 (file)
@@ -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)
 {