| Message ID | 1374681392-6183-1-git-send-email-olof@lixom.net |
|---|---|
| State | New, archived |
| Headers | show |
Hi Olof, > > fb1585bc13b (mtd: nand: omap2: clean-up BCHx_HW and BCHx_SW ECC > configurations in device_probe) introduced a warning when the new option > is disabled, i.e. with omap2plus_defconfig: > > drivers/mtd/nand/omap2.c:1075:13: warning: 'omap3_enable_hwecc_bch' > defined but not used [-Wunused-function] > > Fix this by rescoping the ifdef. Also remove a redudant #endif/#ifdef > pair. > > Signed-off-by: Olof Johansson <olof@lixom.net> > --- Thanks much.. But just to remind, this commit fb1585b in linux-next needs to be reverted. This patch is leftover by mistake because other dependent patches of this series were dropped. This will not only break omap2-nand driver, but might also break the build. http://lists.infradead.org/pipermail/linux-mtd/2013-July/047441.html Please let me know, if something needs to be done from my-side to get this reverted. I have already re-sent a updated version of this series with fixes & copying devicetree-discuss. http://lists.infradead.org/pipermail/linux-mtd/2013-July/047530.html with regards, pekon
On Wed, 2013-07-24 at 17:48 +0000, Gupta, Pekon wrote: > Hi Olof, > > > > > fb1585bc13b (mtd: nand: omap2: clean-up BCHx_HW and BCHx_SW ECC > > configurations in device_probe) introduced a warning when the new option > > is disabled, i.e. with omap2plus_defconfig: > > > > drivers/mtd/nand/omap2.c:1075:13: warning: 'omap3_enable_hwecc_bch' > > defined but not used [-Wunused-function] > > > > Fix this by rescoping the ifdef. Also remove a redudant #endif/#ifdef > > pair. > > > > Signed-off-by: Olof Johansson <olof@lixom.net> > > --- > > Thanks much.. > But just to remind, this commit fb1585b in linux-next needs to be reverted. > This patch is leftover by mistake because other dependent patches of > this series were dropped. This will not only break omap2-nand driver, > but might also break the build. Just dropped it, thanks!
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index c4c7e0d..cbf8b28 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c @@ -1060,6 +1060,7 @@ static int omap_dev_ready(struct mtd_info *mtd) } } +#ifdef CONFIG_MTD_NAND_OMAP_BCH /** * omap3_enable_hwecc_bch - Program OMAP3 GPMC to perform BCH ECC correction * @mtd: MTD device structure @@ -1141,7 +1142,6 @@ static void omap3_enable_hwecc_bch(struct mtd_info *mtd, int mode) writel(ECCCLEAR | ECC1, info->reg.gpmc_ecc_control); } -#ifdef CONFIG_MTD_NAND_ECC_BCH /** * omap3_calculate_ecc_bch4 - Generate 7 bytes of ECC bytes * @mtd: MTD device structure @@ -1959,8 +1959,7 @@ static int omap_nand_probe(struct platform_device *pdev) omap_oobinfo.oobfree->offset = omap_oobinfo.eccpos[0] + omap_oobinfo.eccbytes; goto custom_ecc_layout; -#endif -#ifdef CONFIG_MTD_NAND_ECC_BCH + case OMAP_ECC_BCH8_CODE_HW_DETECTION_SW: pr_info("using OMAP_ECC_BCH8_CODE_HW_DETECTION_SW ECC\n"); info->nand.ecc.mode = NAND_ECC_HW;
fb1585bc13b (mtd: nand: omap2: clean-up BCHx_HW and BCHx_SW ECC configurations in device_probe) introduced a warning when the new option is disabled, i.e. with omap2plus_defconfig: drivers/mtd/nand/omap2.c:1075:13: warning: 'omap3_enable_hwecc_bch' defined but not used [-Wunused-function] Fix this by rescoping the ifdef. Also remove a redudant #endif/#ifdef pair. Signed-off-by: Olof Johansson <olof@lixom.net> --- drivers/mtd/nand/omap2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)