Commit 85f2f2a8 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

mtd: introduce mtd_sync interface 



Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent b0a31f7b

drivers/mtd/ftl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -651,7 +651,7 @@ static int reclaim_block(partition_t *part) 
		pr_debug("ftl_cs: waiting for transfer "

		pr_debug("ftl_cs: waiting for transfer "

		      "unit to be prepared...\n");

		      "unit to be prepared...\n");

		if (part->mbd.mtd->sync)

		if (part->mbd.mtd->sync)

			part->mbd.mtd->sync(part->mbd.mtd);

			mtd_sync(part->mbd.mtd);

	    } else {

	    } else {

		static int ne = 0;

		static int ne = 0;

		if (++ne < 5)

		if (++ne < 5)

drivers/mtd/mtdblock.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -323,7 +323,7 @@ static int mtdblock_release(struct mtd_blktrans_dev *mbd) 
	if (!--mtdblk->count) {

	if (!--mtdblk->count) {

		/* It was the last usage. Free the cache */

		/* It was the last usage. Free the cache */

		if (mbd->mtd->sync)

		if (mbd->mtd->sync)

			mbd->mtd->sync(mbd->mtd);

			mtd_sync(mbd->mtd);

		vfree(mtdblk->cache_data);

		vfree(mtdblk->cache_data);

	}

	}
@@ -343,7 +343,7 @@ static int mtdblock_flush(struct mtd_blktrans_dev *dev) 
	mutex_unlock(&mtdblk->cache_mutex);

	mutex_unlock(&mtdblk->cache_mutex);





	if (dev->mtd->sync)

	if (dev->mtd->sync)

		dev->mtd->sync(dev->mtd);

		mtd_sync(dev->mtd);

	return 0;

	return 0;

}

}

drivers/mtd/mtdchar.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -155,7 +155,7 @@ static int mtdchar_close(struct inode *inode, struct file *file) 




	/* Only sync if opened RW */

	/* Only sync if opened RW */

	if ((file->f_mode & FMODE_WRITE) && mtd->sync)

	if ((file->f_mode & FMODE_WRITE) && mtd->sync)

		mtd->sync(mtd);

		mtd_sync(mtd);





	iput(mfi->ino);

	iput(mfi->ino);

drivers/mtd/mtdconcat.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -620,7 +620,7 @@ static void concat_sync(struct mtd_info *mtd) 




	for (i = 0; i < concat->num_subdev; i++) {

	for (i = 0; i < concat->num_subdev; i++) {

		struct mtd_info *subdev = concat->subdev[i];

		struct mtd_info *subdev = concat->subdev[i];

		subdev->sync(subdev);

		mtd_sync(subdev);

	}

	}

}

}

drivers/mtd/mtdpart.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

static void part_sync(struct mtd_info *mtd)

{

{

	struct mtd_part *part = PART(mtd);

	struct mtd_part *part = PART(mtd);

	part->master->sync(part->master);

	mtd_sync(part->master);

}

}





static int part_suspend(struct mtd_info *mtd)

static int part_suspend(struct mtd_info *mtd)