aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/mtdblock.c
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2011-12-30 09:35:35 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-01-09 13:26:21 -0500
commit327cf2922b4edf0439b219469722d2a502e37349 (patch)
tree6fe4c70d0b4693950e7e20286a3b66bab82ac821 /drivers/mtd/mtdblock.c
parent1dbebd32562b3c2caeca35960e5cb00bfcc12900 (diff)
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>
Diffstat (limited to 'drivers/mtd/mtdblock.c')
-rw-r--r--drivers/mtd/mtdblock.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index 496e1a6e802..af6591237b9 100644
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -322,8 +322,7 @@ static int mtdblock_release(struct mtd_blktrans_dev *mbd)
322 322
323 if (!--mtdblk->count) { 323 if (!--mtdblk->count) {
324 /* It was the last usage. Free the cache */ 324 /* It was the last usage. Free the cache */
325 if (mbd->mtd->sync) 325 mtd_sync(mbd->mtd);
326 mtd_sync(mbd->mtd);
327 vfree(mtdblk->cache_data); 326 vfree(mtdblk->cache_data);
328 } 327 }
329 328
@@ -341,9 +340,7 @@ static int mtdblock_flush(struct mtd_blktrans_dev *dev)
341 mutex_lock(&mtdblk->cache_mutex); 340 mutex_lock(&mtdblk->cache_mutex);
342 write_cached_data(mtdblk); 341 write_cached_data(mtdblk);
343 mutex_unlock(&mtdblk->cache_mutex); 342 mutex_unlock(&mtdblk->cache_mutex);
344 343 mtd_sync(dev->mtd);
345 if (dev->mtd->sync)
346 mtd_sync(dev->mtd);
347 return 0; 344 return 0;
348} 345}
349 346