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: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

4 files changed, 4 insertions, 7 deletions

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 64efcbf087e9..50c6a1e7f675 100644
--- a/drivers/mtd/mtdchar.c
+++ b/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/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index fbf3cb124a93..1ed5103b219b 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/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/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index a4c8f67560e0..db8e8272d69b 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -199,7 +199,7 @@ badblock:
                 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/drivers/mtd/mtdswap.c b/drivers/mtd/mtdswap.c
index 3fc8cb2756c0..c92f0f6bc130 100644
--- a/drivers/mtd/mtdswap.c
+++ b/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);