mtd: introduce mtd_write_oob interface

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

13 files changed, 31 insertions, 27 deletions

diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index 07646e1273e..28646c95cfb 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -178,7 +178,7 @@ int inftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,
         ops.oobbuf = buf;
         ops.datbuf = NULL;
 
-        res = mtd->write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
+        res = mtd_write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
         *retlen = ops.oobretlen;
         return res;
 }
@@ -199,7 +199,7 @@ static int inftl_write(struct mtd_info *mtd, loff_t offs, size_t len,
         ops.datbuf = buf;
         ops.len = len;
 
-        res = mtd->write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
+        res = mtd_write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
         *retlen = ops.retlen;
         return res;
 }
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index e74f570a7b9..234e3d27143 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -325,7 +325,7 @@ static ssize_t mtdchar_write(struct file *file, const char __user *buf, size_t c
                         ops.ooboffs = 0;
                         ops.len = len;
 
-                        ret = mtd->write_oob(mtd, *ppos, &ops);
+                        ret = mtd_write_oob(mtd, *ppos, &ops);
                         retlen = ops.retlen;
                         break;
                 }
@@ -426,7 +426,7 @@ static int mtdchar_writeoob(struct file *file, struct mtd_info *mtd,
                 return PTR_ERR(ops.oobbuf);
 
         start &= ~((uint64_t)mtd->writesize - 1);
-        ret = mtd->write_oob(mtd, start, &ops);
+        ret = mtd_write_oob(mtd, start, &ops);
 
         if (ops.oobretlen > 0xFFFFFFFFU)
                 ret = -EOVERFLOW;
@@ -609,7 +609,7 @@ static int mtdchar_write_ioctl(struct mtd_info *mtd,
                 ops.oobbuf = NULL;
         }
 
-        ret = mtd->write_oob(mtd, (loff_t)req.start, &ops);
+        ret = mtd_write_oob(mtd, (loff_t)req.start, &ops);
 
         kfree(ops.datbuf);
         kfree(ops.oobbuf);
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index cf35642e5f4..3d9c1ffdbbb 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -333,7 +333,7 @@ concat_write_oob(struct mtd_info *mtd, loff_t to, struct mtd_oob_ops *ops)
                 if (to + devops.len > subdev->size)
                         devops.len = subdev->size - to;
 
-                err = subdev->write_oob(subdev, to, &devops);
+                err = mtd_write_oob(subdev, to, &devops);
                 ops->retlen += devops.oobretlen;
                 if (err)
                         return err;
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 6fdc74ef19c..8a46cd2bb78 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -217,7 +217,7 @@ static int part_write_oob(struct mtd_info *mtd, loff_t to,
                 return -EINVAL;
         if (ops->datbuf && to + ops->len > mtd->size)
                 return -EINVAL;
-        return part->master->write_oob(part->master, to + part->offset, ops);
+        return mtd_write_oob(part->master, to + part->offset, ops);
 }
 
 static int part_write_user_prot_reg(struct mtd_info *mtd, loff_t from,
diff --git a/drivers/mtd/mtdswap.c b/drivers/mtd/mtdswap.c
index 0f0ab18d440..85797390e3d 100644
--- a/drivers/mtd/mtdswap.c
+++ b/drivers/mtd/mtdswap.c
@@ -403,7 +403,7 @@ static int mtdswap_write_marker(struct mtdswap_dev *d, struct swap_eb *eb,
                 offset = mtdswap_eb_offset(d, eb) + d->mtd->writesize;
         }
 
-        ret = d->mtd->write_oob(d->mtd, offset , &ops);
+        ret = mtd_write_oob(d->mtd, offset, &ops);
 
         if (ret) {
                 dev_warn(d->dev, "Write OOB failed for block at %08llx "
@@ -946,7 +946,7 @@ static unsigned int mtdswap_eblk_passes(struct mtdswap_dev *d,
                         patt = mtdswap_test_patt(test + i);
                         memset(d->page_buf, patt, mtd->writesize);
                         memset(d->oob_buf, patt, mtd->ecclayout->oobavail);
-                        ret = mtd->write_oob(mtd, pos, &ops);
+                        ret = mtd_write_oob(mtd, pos, &ops);
                         if (ret)
                                 goto error;
 
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index fcab50e80b9..20a112f591f 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -350,7 +350,7 @@ static int scan_write_bbt(struct mtd_info *mtd, loff_t offs, size_t len,
         ops.oobbuf = oob;
         ops.len = len;
 
-        return mtd->write_oob(mtd, offs, &ops);
+        return mtd_write_oob(mtd, offs, &ops);
 }
 
 static u32 bbt_get_ver_offs(struct mtd_info *mtd, struct nand_bbt_descr *td)
diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
index 32ae5af7444..774c3c26671 100644
--- a/drivers/mtd/nand/sm_common.c
+++ b/drivers/mtd/nand/sm_common.c
@@ -55,7 +55,7 @@ static int sm_block_markbad(struct mtd_info *mtd, loff_t ofs)
         ops.datbuf = NULL;
 
 
-        ret = mtd->write_oob(mtd, ofs, &ops);
+        ret = mtd_write_oob(mtd, ofs, &ops);
         if (ret < 0 || ops.oobretlen != SM_OOB_SIZE) {
                 printk(KERN_NOTICE
                         "sm_common: can't mark sector at %i as bad\n",
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index 7497f5efc26..8847e60ad16 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -174,7 +174,7 @@ int nftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,
         ops.oobbuf = buf;
         ops.datbuf = NULL;
 
-        res = mtd->write_oob(mtd, offs & ~mask, &ops);
+        res = mtd_write_oob(mtd, offs & ~mask, &ops);
         *retlen = ops.oobretlen;
         return res;
 }
@@ -198,7 +198,7 @@ static int nftl_write(struct mtd_info *mtd, loff_t offs, size_t len,
         ops.datbuf = buf;
         ops.len = len;
 
-        res = mtd->write_oob(mtd, offs & ~mask, &ops);
+        res = mtd_write_oob(mtd, offs & ~mask, &ops);
         *retlen = ops.retlen;
         return res;
 }
diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
index 748aa441669..4ec2af7fb84 100644
--- a/drivers/mtd/sm_ftl.c
+++ b/drivers/mtd/sm_ftl.c
@@ -343,7 +343,7 @@ static int sm_write_sector(struct sm_ftl *ftl,
         ops.ooblen = SM_OOB_SIZE;
         ops.oobbuf = (void *)oob;
 
-        ret = mtd->write_oob(mtd, sm_mkoffset(ftl, zone, block, boffset), &ops);
+        ret = mtd_write_oob(mtd, sm_mkoffset(ftl, zone, block, boffset), &ops);
 
         /* Now we assume that hardware will catch write bitflip errors */
         /* If you are paranoid, use CONFIG_MTD_NAND_VERIFY_WRITE */
diff --git a/drivers/mtd/tests/mtd_oobtest.c b/drivers/mtd/tests/mtd_oobtest.c
index 962d27a64e6..81113885e08 100644
--- a/drivers/mtd/tests/mtd_oobtest.c
+++ b/drivers/mtd/tests/mtd_oobtest.c
@@ -139,7 +139,7 @@ static int write_eraseblock(int ebnum)
                 ops.ooboffs   = use_offset;
                 ops.datbuf    = NULL;
                 ops.oobbuf    = writebuf;
-                err = mtd->write_oob(mtd, addr, &ops);
+                err = mtd_write_oob(mtd, addr, &ops);
                 if (err || ops.oobretlen != use_len) {
                         printk(PRINT_PREF "error: writeoob failed at %#llx\n",
                                (long long)addr);