Message ID | 1449527178-5930-23-git-send-email-boris.brezillon@free-electrons.com |
---|---|
State | Superseded |
Headers | show |
Hi Boris, [auto build test ERROR on next-20151207] [cannot apply to staging/staging-testing v4.4-rc4 v4.4-rc3 v4.4-rc2 v4.4-rc4] url: https://github.com/0day-ci/linux/commits/Boris-Brezillon/mtd-rework-ECC-layout-definition/20151208-063127 config: powerpc-allyesconfig (attached as .config) reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=powerpc All error/warnings (new ones prefixed by >>): In file included from include/linux/printk.h:277:0, from include/linux/kernel.h:13, from include/linux/list.h:8, from include/linux/module.h:9, from drivers/mtd/nand/fsl_elbc_nand.c:25: drivers/mtd/nand/fsl_elbc_nand.c: In function 'fsl_elbc_chip_init_tail': >> drivers/mtd/nand/fsl_elbc_nand.c:683:19: error: 'struct nand_ecc_ctrl' has no member named 'layout' chip->ecc.layout); ^ include/linux/dynamic_debug.h:87:9: note: in definition of macro 'dynamic_dev_dbg' ##__VA_ARGS__); \ ^ >> drivers/mtd/nand/fsl_elbc_nand.c:682:2: note: in expansion of macro 'dev_dbg' dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.layout = %p\n", ^ drivers/mtd/nand/fsl_elbc_nand.c: In function 'fsl_elbc_chip_init': drivers/mtd/nand/fsl_elbc_nand.c:797:34: error: 'fsl_elbc_ooblayout_op' undeclared (first use in this function) mtd_set_ooblayout(&priv->mtd, &fsl_elbc_ooblayout_op); ^ drivers/mtd/nand/fsl_elbc_nand.c:797:34: note: each undeclared identifier is reported only once for each function it appears in vim +683 drivers/mtd/nand/fsl_elbc_nand.c 3ab8f2a2 Roy Zang 2010-10-18 676 dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.steps = %d\n", 76b10467 Scott Wood 2008-02-06 677 chip->ecc.steps); 3ab8f2a2 Roy Zang 2010-10-18 678 dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.bytes = %d\n", 76b10467 Scott Wood 2008-02-06 679 chip->ecc.bytes); 3ab8f2a2 Roy Zang 2010-10-18 680 dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.total = %d\n", 76b10467 Scott Wood 2008-02-06 681 chip->ecc.total); 3ab8f2a2 Roy Zang 2010-10-18 @682 dev_dbg(priv->dev, "fsl_elbc_init: nand->ecc.layout = %p\n", 76b10467 Scott Wood 2008-02-06 @683 chip->ecc.layout); 3ab8f2a2 Roy Zang 2010-10-18 684 dev_dbg(priv->dev, "fsl_elbc_init: mtd->flags = %08x\n", mtd->flags); 3ab8f2a2 Roy Zang 2010-10-18 685 dev_dbg(priv->dev, "fsl_elbc_init: mtd->size = %lld\n", mtd->size); 3ab8f2a2 Roy Zang 2010-10-18 686 dev_dbg(priv->dev, "fsl_elbc_init: mtd->erasesize = %d\n", :::::: The code at line 683 was first introduced by commit :::::: 76b104671632c225ad594a50f9e26ada67bc0a74 [MTD] [NAND] Freescale enhanced Local Bus Controller FCM NAND support. :::::: TO: Scott Wood <scottwood@freescale.com> :::::: CC: David Woodhouse <dwmw2@infradead.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 6440c5d..85deacb 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -4148,13 +4148,6 @@ int nand_scan_tail(struct mtd_info *mtd) chip->oob_poi = chip->buffers->databuf + mtd->writesize; /* - * Set the provided ECC layout. If ecc->layout is NULL, the MTD core - * will just leave mtd->ooblayout to NULL, if it's not NULL, it will - * set ->ooblayout to the default ecclayout wrapper. - */ - mtd_set_ecclayout(mtd, ecc->layout); - - /* * If no default placement scheme is given, select an appropriate one. */ if (!mtd->ooblayout && (ecc->mode != NAND_ECC_SOFT_BCH)) { @@ -4401,7 +4394,6 @@ int nand_scan_tail(struct mtd_info *mtd) mtd->writebufsize = mtd->writesize; /* propagate ecc info to mtd_info */ - mtd_set_ecclayout(mtd, ecc->layout); mtd->ecc_strength = ecc->strength; mtd->ecc_step_size = ecc->size; /* diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c index 2937b49..3b90643 100644 --- a/drivers/mtd/nand/nand_bch.c +++ b/drivers/mtd/nand/nand_bch.c @@ -158,15 +158,6 @@ struct nand_bch_control *nand_bch_init(struct mtd_info *mtd) eccsteps = mtd->writesize/eccsize; - /* - * Rely on the default ecclayout to ooblayout wrapper provided by MTD - * core if ecc.layout is not NULL. - * FIXME: this should be removed when all callers have moved to the - * mtd_ooblayout_ops approach. - */ - if (nand->ecc.layout) - mtd_set_ecclayout(mtd, nand->ecc.layout); - /* if no ecc placement scheme was provided, build one */ if (!mtd->ooblayout) { diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 9ba9daba..f4ba147 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -494,7 +494,6 @@ struct nand_ecc_ctrl { int strength; int prepad; int postpad; - struct nand_ecclayout *layout; void *priv; void (*hwctl)(struct mtd_info *mtd, int mode); int (*calculate)(struct mtd_info *mtd, const uint8_t *dat,
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> --- drivers/mtd/nand/nand_base.c | 8 -------- drivers/mtd/nand/nand_bch.c | 9 --------- include/linux/mtd/nand.h | 1 - 3 files changed, 18 deletions(-)