mtd: introduce mtd_sync interface

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

diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index d591b1d0a6c15d8d942c4a0cb11960685891353c..c9c90299c9e22d69ac98c2107bd949833417a0de 100644 (file)
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -651,7 +651,7 @@ static int reclaim_block(partition_t *part)
                pr_debug("ftl_cs: waiting for transfer "
                      "unit to be prepared...\n");
                if (part->mbd.mtd->sync)
-                       part->mbd.mtd->sync(part->mbd.mtd);
+                       mtd_sync(part->mbd.mtd);
            } else {
                static int ne = 0;
                if (++ne < 5)

diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index ac7f1f1faa2db1611ba756d2b5aba330d671bafc..496e1a6e80294d99898734f43f386cc0c726d5ed 100644 (file)
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -323,7 +323,7 @@ static int mtdblock_release(struct mtd_blktrans_dev *mbd)
        if (!--mtdblk->count) {
                /* It was the last usage. Free the cache */
                if (mbd->mtd->sync)
-                       mbd->mtd->sync(mbd->mtd);
+                       mtd_sync(mbd->mtd);
                vfree(mtdblk->cache_data);
        }
 
@@ -343,7 +343,7 @@ static int mtdblock_flush(struct mtd_blktrans_dev *dev)
        mutex_unlock(&mtdblk->cache_mutex);
 
        if (dev->mtd->sync)
-               dev->mtd->sync(dev->mtd);
+               mtd_sync(dev->mtd);
        return 0;
 }
 

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 86308acb40e0026554d6179615ed6974f17f1c5b..b5722ecf19d3992acaccd71e7ee6ae5ee4cdc324 100644 (file)
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -155,7 +155,7 @@ static int mtdchar_close(struct inode *inode, struct file *file)
 
        /* Only sync if opened RW */
        if ((file->f_mode & FMODE_WRITE) && mtd->sync)
-               mtd->sync(mtd);
+               mtd_sync(mtd);
 
        iput(mfi->ino);
 

diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 6fdae191e1baf96429f716726d6c175b1ee45634..cc2336edfe28681f2dc7f218b568fa536b3a1e49 100644 (file)
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -620,7 +620,7 @@ static void concat_sync(struct mtd_info *mtd)
 
        for (i = 0; i < concat->num_subdev; i++) {
                struct mtd_info *subdev = concat->subdev[i];
-               subdev->sync(subdev);
+               mtd_sync(subdev);
        }
 }
 

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index c0bfa88c82f337e1bfb5e9e44f134cba8dd56416..2b545052795ee107026ae11ed54b3e72d2e26311 100644 (file)
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -301,7 +301,7 @@ static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 static void part_sync(struct mtd_info *mtd)
 {
        struct mtd_part *part = PART(mtd);
-       part->master->sync(part->master);
+       mtd_sync(part->master);
 }
 
 static int part_suspend(struct mtd_info *mtd)

diff --git a/drivers/mtd/mtdswap.c b/drivers/mtd/mtdswap.c
index 85797390e3ddac488fdd215134ad08490f6c4630..cb794e761012d075163b64a7c6f7fbf6bcb4f551 100644 (file)
--- a/drivers/mtd/mtdswap.c
+++ b/drivers/mtd/mtdswap.c
@@ -1048,7 +1048,7 @@ static int mtdswap_flush(struct mtd_blktrans_dev *dev)
        struct mtdswap_dev *d = MTDSWAP_MBD_TO_MTDSWAP(dev);
 
        if (d->mtd->sync)
-               d->mtd->sync(d->mtd);
+               mtd_sync(d->mtd);
        return 0;
 }
 

diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c
index c594bb7abfa3d0eaca622a10acb12bc9b5cc8026..5426d42cdea7839a8904c58b7c113196c793f8e1 100644 (file)
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
@@ -449,7 +449,7 @@ static int reclaim_block(struct partition *part, u_long *old_sector)
 
        /* we have a race if sync doesn't exist */
        if (part->mbd.mtd->sync)
-               part->mbd.mtd->sync(part->mbd.mtd);
+               mtd_sync(part->mbd.mtd);
 
        score = 0x7fffffff; /* MAX_INT */
        best_block = -1;

diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index 1a35fc5e3b40a947451acc340b58b7c29f2ded41..9f265cc1a0d32b7446bb18b37079c56d8674e44d 100644 (file)
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -715,7 +715,7 @@ int ubi_sync(int ubi_num)
                return -ENODEV;
 
        if (ubi->mtd->sync)
-               ubi->mtd->sync(ubi->mtd);
+               mtd_sync(ubi->mtd);
 
        ubi_put_device(ubi);
        return 0;

diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index e7e97445411569d506ad5ac845e9cff3fc511971..e78bf3cd1b73f8d26e3ec3e728aea5a34b4d8e7c 100644 (file)
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -337,7 +337,7 @@ static void jffs2_put_super (struct super_block *sb)
        kfree(c->inocache_list);
        jffs2_clear_xattr_subsystem(c);
        if (c->mtd->sync)
-               c->mtd->sync(c->mtd);
+               mtd_sync(c->mtd);
 
        D1(printk(KERN_DEBUG "jffs2_put_super returning\n"));
 }

diff --git a/fs/logfs/dev_mtd.c b/fs/logfs/dev_mtd.c
index 1842440d65640d800c5490ad86494cf6364aad48..0ca7a07db6c11aeb8e27a947269a33ec69f35258 100644 (file)
--- a/fs/logfs/dev_mtd.c
+++ b/fs/logfs/dev_mtd.c
@@ -120,7 +120,7 @@ static void logfs_mtd_sync(struct super_block *sb)
        struct mtd_info *mtd = logfs_super(sb)->s_mtd;
 
        if (mtd->sync)
-               mtd->sync(mtd);
+               mtd_sync(mtd);
 }
 
 static int logfs_mtd_readpage(void *_sb, struct page *page)

diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 4129cb5c3de4bd178cb710268a886b21c789de8f..47ea19c1e5237765d4b4c8ead3b5abe79dbbc63f 100644 (file)
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -206,15 +206,13 @@ struct mtd_info {
                                   size_t len);
        int (*writev) (struct mtd_info *mtd, const struct kvec *vecs,
                        unsigned long count, loff_t to, size_t *retlen);
+       void (*sync) (struct mtd_info *mtd);
 
        /* Backing device capabilities for this device
         * - provides mmap capabilities
         */
        struct backing_dev_info *backing_dev_info;
 
-       /* Sync */
-       void (*sync) (struct mtd_info *mtd);
-
        /* Chip-supported device locking */
        int (*lock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
        int (*unlock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
@@ -381,6 +379,11 @@ static inline int mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,
        return mtd->writev(mtd, vecs, count, to, retlen);
 }
 
+static inline void mtd_sync(struct mtd_info *mtd)
+{
+       mtd->sync(mtd);
+}
+
 static inline struct mtd_info *dev_to_mtd(struct device *dev)
 {
        return dev ? dev_get_drvdata(dev) : NULL;