mtd: do not use mtd->sync directly

This patch teaches 'mtd_sync()' to do nothing when the MTD driver does
not have the '->sync()' method, which allows us to remove all direct
'mtd->sync' accesses.

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 c9c90299c9e22d69ac98c2107bd949833417a0de..19d637266fcd47026c26b6172b052f1becc23ec4 100644 (file)
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -650,8 +650,7 @@ static int reclaim_block(partition_t *part)
            if (queued) {
                pr_debug("ftl_cs: waiting for transfer "
                      "unit to be prepared...\n");
-               if (part->mbd.mtd->sync)
-                       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 496e1a6e80294d99898734f43f386cc0c726d5ed..af6591237b9b51f22022e61a653fa7a5d8e29845 100644 (file)
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -322,8 +322,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)
-                       mtd_sync(mbd->mtd);
+               mtd_sync(mbd->mtd);
                vfree(mtdblk->cache_data);
        }
 
@@ -341,9 +340,7 @@ static int mtdblock_flush(struct mtd_blktrans_dev *dev)
        mutex_lock(&mtdblk->cache_mutex);
        write_cached_data(mtdblk);
        mutex_unlock(&mtdblk->cache_mutex);
-
-       if (dev->mtd->sync)
-               mtd_sync(dev->mtd);
+       mtd_sync(dev->mtd);
        return 0;
 }
 

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 2020a169ed9c79098467c0815bfbdd56eae35497..23a51104aeb5fcb04ebefe07b0a21895c847876d 100644 (file)
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -154,7 +154,7 @@ static int mtdchar_close(struct inode *inode, struct file *file)
        pr_debug("MTD_close\n");
 
        /* Only sync if opened RW */
-       if ((file->f_mode & FMODE_WRITE) && mtd->sync)
+       if ((file->f_mode & FMODE_WRITE))
                mtd_sync(mtd);
 
        iput(mfi->ino);

diff --git a/drivers/mtd/mtdswap.c b/drivers/mtd/mtdswap.c
index 4441c08b082d9ca797fde51afd84d7a2c89594e9..fe4426c1c73699ad522a080eed699aa905d5ff9b 100644 (file)
--- a/drivers/mtd/mtdswap.c
+++ b/drivers/mtd/mtdswap.c
@@ -1047,8 +1047,7 @@ static int mtdswap_flush(struct mtd_blktrans_dev *dev)
 {
        struct mtdswap_dev *d = MTDSWAP_MBD_TO_MTDSWAP(dev);
 
-       if (d->mtd->sync)
-               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 5426d42cdea7839a8904c58b7c113196c793f8e1..233b946e5d66d95a2cfbabb19985e5f8a75efb13 100644 (file)
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
@@ -448,8 +448,7 @@ static int reclaim_block(struct partition *part, u_long *old_sector)
        int rc;
 
        /* we have a race if sync doesn't exist */
-       if (part->mbd.mtd->sync)
-               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 9f265cc1a0d32b7446bb18b37079c56d8674e44d..9fdb35367fe0478c1625b1c94c63d0349d7a025d 100644 (file)
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -714,9 +714,7 @@ int ubi_sync(int ubi_num)
        if (!ubi)
                return -ENODEV;
 
-       if (ubi->mtd->sync)
-               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 e78bf3cd1b73f8d26e3ec3e728aea5a34b4d8e7c..5863a369d929b4e652ed93bbeab466ab72130d58 100644 (file)
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -336,9 +336,7 @@ static void jffs2_put_super (struct super_block *sb)
        jffs2_flash_cleanup(c);
        kfree(c->inocache_list);
        jffs2_clear_xattr_subsystem(c);
-       if (c->mtd->sync)
-               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 136c7360a9b6b75ed41292a23b299c7f9b445a60..3f465882ee70b84dc7579beb24fe428c6edf9963 100644 (file)
--- a/fs/logfs/dev_mtd.c
+++ b/fs/logfs/dev_mtd.c
@@ -119,8 +119,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 a58ecf4d1f8043b0e6ddd3aab2d8f61d59660040..305f12b940f43a48f5d8a1fc0154e48de025ca2b 100644 (file)
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -399,7 +399,8 @@ int mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,
 
 static inline void mtd_sync(struct mtd_info *mtd)
 {
-       mtd->sync(mtd);
+       if (mtd->sync)
+               mtd->sync(mtd);
 }
 
 /* Chip-supported device locking */