[PATCH] mtd: nand_base: replace ifdef with IS_ENABLE

[Antony Pavlov]

On Wed, 5 Aug 2015 09:53:56 +0200
Sascha Hauer <s.hauer at pengutronix.de> wrote:

> On Wed, Aug 05, 2015 at 09:10:34AM +0300, Antony Pavlov wrote:
> > Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>
> > ---
> >  drivers/mtd/nand/nand_base.c | 14 +++++++-------
> >  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> Applied, thanks

It looks like I have to recall this patch.

+       if (IS_ENABLED(CONFIG_NAND_BBT)) {
+               if (!chip->bbt)
+                       return chip->block_bad(mtd, ofs, getchip);
+
+               /* Return info from the table */
+               return nand_isbad_bbt(mtd, ofs, allowbbt);
+       }

the nand_isbad_bbt() function is defined in drivers/mtd/nand/nand_bbt.c,
but nand_bbt.c is compiled-in only if CONFIG_NAND_BBT is enabled.

My current gcc-4.9.2-based toolchain has no problem with this,
but if CONFIG_NAND_BBT is disabled I suppose rather old toolchain can throw link error here.

I have to add something like this

#ifndef CONFIG_NAND_BBT

static inline nand_isbad_bbt(...) { };

#endif

to include/linux/mtd/nand.h.


-- 
Best regards,
  Antony Pavlov