mtd: introduce mtd_block_markbad interface

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

12 files changed, 17 insertions, 14 deletions

diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
index 38519401196b..4adc0374fb6b 100644
--- a/drivers/mtd/inftlmount.c
+++ b/drivers/mtd/inftlmount.c
@@ -424,7 +424,7 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)
 fail:
         /* could not format, update the bad block table (caller is responsible
            for setting the PUtable to BLOCK_RESERVED on failure) */
-        inftl->mbd.mtd->block_markbad(inftl->mbd.mtd, instr->addr);
+        mtd_block_markbad(inftl->mbd.mtd, instr->addr);
         return -1;
 }
 
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index a499bf7a8214..15a3f6224be4 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -899,7 +899,7 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg)
                 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 d0db5e61d5af..f694b51e7856 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -693,7 +693,7 @@ static int concat_block_markbad(struct mtd_info *mtd, loff_t ofs)
                         continue;
                 }
 
-                err = subdev->block_markbad(subdev, ofs);
+                err = mtd_block_markbad(subdev, ofs);
                 if (!err)
                         mtd->ecc_stats.badblocks++;
                 break;
diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index bc43d2f7272c..69532a34e563 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -200,7 +200,7 @@ badblock:
         }
 
         if (mtd->block_markbad && ret == -EIO) {
-                ret = mtd->block_markbad(mtd, cxt->nextpage * record_size);
+                ret = mtd_block_markbad(mtd, cxt->nextpage * record_size);
                 if (ret < 0) {
                         printk(KERN_ERR "mtdoops: block_markbad failed, aborting\n");
                         return;
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 0e7dfc79d337..a3d44c3416b4 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -335,7 +335,7 @@ static int part_block_markbad(struct mtd_info *mtd, loff_t ofs)
         if (ofs >= mtd->size)
                 return -EINVAL;
         ofs += part->offset;
-        res = part->master->block_markbad(part->master, ofs);
+        res = mtd_block_markbad(part->master, ofs);
         if (!res)
                 mtd->ecc_stats.badblocks++;
         return res;
diff --git a/drivers/mtd/mtdswap.c b/drivers/mtd/mtdswap.c
index 87aa0a6323c3..4441c08b082d 100644
--- a/drivers/mtd/mtdswap.c
+++ b/drivers/mtd/mtdswap.c
@@ -279,7 +279,7 @@ static int mtdswap_handle_badblock(struct mtdswap_dev *d, struct swap_eb *eb)
 
         offset = mtdswap_eb_offset(d, eb);
         dev_warn(d->dev, "Marking bad block at %08llx\n", offset);
-        ret = d->mtd->block_markbad(d->mtd, offset);
+        ret = mtd_block_markbad(d->mtd, offset);
 
         if (ret) {
                 dev_warn(d->dev, "Mark block bad failed for block at %08llx "
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 34c03be77301..261f478f8cc3 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -737,7 +737,7 @@ static int parse_badblocks(struct nandsim *ns, struct mtd_info *mtd)
                         return -EINVAL;
                 }
                 offset = erase_block_no * ns->geom.secsz;
-                if (mtd->block_markbad(mtd, offset)) {
+                if (mtd_block_markbad(mtd, offset)) {
                         NS_ERR("invalid badblocks.\n");
                         return -EINVAL;
                 }
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
index 156af9f87961..51b9d6af307f 100644
--- a/drivers/mtd/nftlmount.c
+++ b/drivers/mtd/nftlmount.c
@@ -356,7 +356,7 @@ int NFTL_formatblock(struct NFTLrecord *nftl, int block)
 fail:
         /* could not format, update the bad block table (caller is responsible
            for setting the ReplUnitTable to BLOCK_RESERVED on failure) */
-        nftl->mbd.mtd->block_markbad(nftl->mbd.mtd, instr->addr);
+        mtd_block_markbad(nftl->mbd.mtd, instr->addr);
         return -1;
 }
 
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index a8394730b4b6..dd278a284136 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -2645,7 +2645,7 @@ static int onenand_block_markbad(struct mtd_info *mtd, loff_t ofs)
         }
 
         onenand_get_device(mtd, FL_WRITING);
-        ret = this->block_markbad(mtd, ofs);
+        ret = mtd_block_markbad(mtd, ofs);
         onenand_release_device(mtd);
         return ret;
 }
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index a1b683ad639e..5cde4e5ca3e5 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -669,7 +669,7 @@ int ubi_io_mark_bad(const struct ubi_device *ubi, int pnum)
         if (!ubi->bad_allowed)
                 return 0;
 
-        err = mtd->block_markbad(mtd, (loff_t)pnum * ubi->peb_size);
+        err = mtd_block_markbad(mtd, (loff_t)pnum * ubi->peb_size);
         if (err)
                 ubi_err("cannot mark PEB %d bad, error %d", pnum, err);
         return err;
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index eae5be483682..fd96b757433f 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -1134,7 +1134,7 @@ int jffs2_write_nand_badblock(struct jffs2_sb_info *c, struct jffs2_eraseblock *
                 return 1; // What else can we do?
 
         printk(KERN_WARNING "JFFS2: marking eraseblock at %08x\n as bad", bad_offset);
-        ret = c->mtd->block_markbad(c->mtd, bad_offset);
+        ret = mtd_block_markbad(c->mtd, bad_offset);
 
         if (ret) {
                 D1(printk(KERN_WARNING "jffs2_write_nand_badblock(): Write failed for block at %08x: error %d\n", jeb->offset, ret));
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index a307ad093a54..64aa54fba2df 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -211,6 +211,7 @@ struct mtd_info {
         int (*unlock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
         int (*is_locked) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
         int (*block_isbad) (struct mtd_info *mtd, loff_t ofs);
+        int (*block_markbad) (struct mtd_info *mtd, loff_t ofs);
         int (*suspend) (struct mtd_info *mtd);
         void (*resume) (struct mtd_info *mtd);
 
@@ -219,9 +220,6 @@ struct mtd_info {
          */
         struct backing_dev_info *backing_dev_info;
 
-        /* Bad block management functions */
-        int (*block_markbad) (struct mtd_info *mtd, loff_t ofs);
-
         struct notifier_block reboot_notifier;  /* default mode before reboot */
 
         /* ECC status information */
@@ -411,6 +409,11 @@ static inline int mtd_block_isbad(struct mtd_info *mtd, loff_t ofs)
         return mtd->block_isbad(mtd, ofs);
 }
 
+static inline int mtd_block_markbad(struct mtd_info *mtd, loff_t ofs)
+{
+        return mtd->block_markbad(mtd, ofs);
+}
+
 static inline struct mtd_info *dev_to_mtd(struct device *dev)
 {
         return dev ? dev_get_drvdata(dev) : NULL;