diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-04-07 17:04:32 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-04-12 09:54:55 +0200 |
| commit | 5386d6d77ce685ccc1e4f020c204902dd4499fb1 (patch) | |
| tree | 636b86ae201a473afd521f5882b3c2cd37febd98 | |
| parent | a7cbbaf19a62e126bfdd80b2a6077be4105f662d (diff) | |
| download | barebox-5386d6d77ce685ccc1e4f020c204902dd4499fb1.tar.gz barebox-5386d6d77ce685ccc1e4f020c204902dd4499fb1.tar.xz | |
nand: nand_block_markbad is only used with nand write support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/mtd/nand/nand.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand.h | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 23 |
3 files changed, 5 insertions, 21 deletions
diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c index deb9400f2d..9423ac8092 100644 --- a/drivers/mtd/nand/nand.c +++ b/drivers/mtd/nand/nand.c @@ -116,9 +116,11 @@ static int nand_ioctl(struct cdev *cdev, int request, void *buf) case MEMGETBADBLOCK: debug("MEMGETBADBLOCK: 0x%08lx\n", (off_t)buf); return info->block_isbad(info, (off_t)buf); +#ifdef CONFIG_NAND_WRITE case MEMSETBADBLOCK: debug("MEMSETBADBLOCK: 0x%08lx\n", (off_t)buf); return info->block_markbad(info, (off_t)buf); +#endif case MEMGETINFO: user->type = info->type; user->flags = info->flags; diff --git a/drivers/mtd/nand/nand.h b/drivers/mtd/nand/nand.h index 15bed4e39c..123258d7cb 100644 --- a/drivers/mtd/nand/nand.h +++ b/drivers/mtd/nand/nand.h @@ -9,6 +9,7 @@ int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs); int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip, int allowbbt); int nand_block_isbad(struct mtd_info *mtd, loff_t offs); +int nand_block_markbad(struct mtd_info *mtd, loff_t ofs); void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len); void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len); void single_erase_cmd(struct mtd_info *mtd, int page); diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index d627f162d7..5e122a10a5 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -981,26 +981,6 @@ int nand_block_isbad(struct mtd_info *mtd, loff_t offs) return nand_block_checkbad(mtd, offs, 1, 0); } -/** - * nand_block_markbad - [MTD Interface] Mark block at the given offset as bad - * @mtd: MTD device structure - * @ofs: offset relative to mtd start - */ -static int nand_block_markbad(struct mtd_info *mtd, loff_t ofs) -{ - struct nand_chip *chip = mtd->priv; - int ret; - - if ((ret = nand_block_isbad(mtd, ofs))) { - /* If it was bad already, return success and do nothing. */ - if (ret > 0) - return 0; - return ret; - } - - return chip->block_markbad(mtd, ofs); -} - /* * Set default functions */ @@ -1431,8 +1411,9 @@ int nand_scan_tail(struct mtd_info *mtd) mtd->lock = NULL; mtd->unlock = NULL; mtd->block_isbad = nand_block_isbad; +#ifdef CONFIG_NAND_WRITE mtd->block_markbad = nand_block_markbad; - +#endif /* propagate ecc.layout to mtd_info */ mtd->ecclayout = chip->ecc.layout; |