Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 800ffd34 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

mtd: do not use mtd->block_markbad directly 



Instead, use the new 'mtd_can_have_bb()', or just rely on 'mtd_block_markbad()'
return code, which will be -EOPNOTSUPP if bad blocks are not supported.

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent d58b27ed

drivers/mtd/mtdchar.c

+1 −4
Original line number Diff line number Diff line
@@ -877,9 +877,6 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg) 


		if (copy_from_user(&offs, argp, sizeof(loff_t)))

			return -EFAULT;

		if (!mtd->block_markbad)

			ret = -EOPNOTSUPP;

		else

		return mtd_block_markbad(mtd, offs);

		break;

	}

drivers/mtd/mtdconcat.c

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ static int concat_block_markbad(struct mtd_info *mtd, loff_t ofs) 
	struct mtd_concat *concat = CONCAT(mtd);

	int i, err = -EINVAL;



	if (!concat->subdev[0]->block_markbad)

	if (!mtd_can_have_bb(concat->subdev[0]))

		return 0;



	if (ofs > mtd->size)

drivers/mtd/mtdoops.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static void mtdoops_workfunc_erase(struct work_struct *work) 
		return;

	}



	if (mtd->block_markbad && ret == -EIO) {

	if (mtd_can_have_bb(mtd) && ret == -EIO) {

		ret = mtd_block_markbad(mtd, cxt->nextpage * record_size);

		if (ret < 0) {

			printk(KERN_ERR "mtdoops: block_markbad failed, aborting\n");

drivers/mtd/mtdswap.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static int mtdswap_handle_badblock(struct mtdswap_dev *d, struct swap_eb *eb) 
	eb->root = NULL;



	/* badblocks not supported */

	if (!d->mtd->block_markbad)

	if (!mtd_can_have_bb(d->mtd))

		return 1;



	offset = mtdswap_eb_offset(d, eb);

fs/jffs2/wbuf.c

+0 −3
Original line number Diff line number Diff line
@@ -1130,9 +1130,6 @@ int jffs2_write_nand_badblock(struct jffs2_sb_info *c, struct jffs2_eraseblock * 
	if( ++jeb->bad_count < MAX_ERASE_FAILURES)

		return 0;



	if (!c->mtd->block_markbad)

		return 1; // What else can we do?



	printk(KERN_WARNING "JFFS2: marking eraseblock at %08x\n as bad", bad_offset);

	ret = mtd_block_markbad(c->mtd, bad_offset);