From 533a70fb00aeaab4b7e720bc526d9b0f4f68cfc8 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Date: Mon, 2 Jan 2012 13:59:12 +0200
Subject: [PATCH] --- yaml --- r: 282918 b: refs/heads/master c:
 800ffd3496987e91f599a135060ef49731e045ac h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/mtd/mtdchar.c   | 5 +----
 trunk/drivers/mtd/mtdconcat.c | 2 +-
 trunk/drivers/mtd/mtdoops.c   | 2 +-
 trunk/drivers/mtd/mtdswap.c   | 2 +-
 trunk/fs/jffs2/wbuf.c         | 3 ---
 trunk/include/linux/mtd/mtd.h | 2 ++
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 68fa4f1be2f7..f733c00dbc5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d58b27ed58a30faf376e40d19945f34301944b8d
+refs/heads/master: 800ffd3496987e91f599a135060ef49731e045ac
diff --git a/trunk/drivers/mtd/mtdchar.c b/trunk/drivers/mtd/mtdchar.c
index 64efcbf087e9..50c6a1e7f675 100644
--- a/trunk/drivers/mtd/mtdchar.c
+++ b/trunk/drivers/mtd/mtdchar.c
@@ -877,10 +877,7 @@ 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);
+		return mtd_block_markbad(mtd, offs);
 		break;
 	}
 
diff --git a/trunk/drivers/mtd/mtdconcat.c b/trunk/drivers/mtd/mtdconcat.c
index fbf3cb124a93..1ed5103b219b 100644
--- a/trunk/drivers/mtd/mtdconcat.c
+++ b/trunk/drivers/mtd/mtdconcat.c
@@ -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)
diff --git a/trunk/drivers/mtd/mtdoops.c b/trunk/drivers/mtd/mtdoops.c
index a4c8f67560e0..db8e8272d69b 100644
--- a/trunk/drivers/mtd/mtdoops.c
+++ b/trunk/drivers/mtd/mtdoops.c
@@ -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");
diff --git a/trunk/drivers/mtd/mtdswap.c b/trunk/drivers/mtd/mtdswap.c
index 3fc8cb2756c0..c92f0f6bc130 100644
--- a/trunk/drivers/mtd/mtdswap.c
+++ b/trunk/drivers/mtd/mtdswap.c
@@ -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);
diff --git a/trunk/fs/jffs2/wbuf.c b/trunk/fs/jffs2/wbuf.c
index fd96b757433f..30e8f47e8a23 100644
--- a/trunk/fs/jffs2/wbuf.c
+++ b/trunk/fs/jffs2/wbuf.c
@@ -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);
 
diff --git a/trunk/include/linux/mtd/mtd.h b/trunk/include/linux/mtd/mtd.h
index 7e35755f6931..1a81fde8f333 100644
--- a/trunk/include/linux/mtd/mtd.h
+++ b/trunk/include/linux/mtd/mtd.h
@@ -447,6 +447,8 @@ static inline int mtd_block_isbad(struct mtd_info *mtd, loff_t ofs)
 
 static inline int mtd_block_markbad(struct mtd_info *mtd, loff_t ofs)
 {
+	if (!mtd->block_markbad)
+		return -EOPNOTSUPP;
 	return mtd->block_markbad(mtd, ofs);
 }