Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mtd: introduce mtd_point interface 



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

drivers/mtd/mtdpart.c

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ static int part_point(struct mtd_info *mtd, loff_t from, size_t len, 
		len = 0;

	else if (from + len > mtd->size)

		len = mtd->size - from;

	return part->master->point (part->master, from + part->offset,

				    len, retlen, virt, phys);

	return mtd_point(part->master, from + part->offset, len, retlen,

			 virt, phys);

}



static void part_unpoint(struct mtd_info *mtd, loff_t from, size_t len)

fs/jffs2/erase.c

+2 −2
Original line number Diff line number Diff line
@@ -340,8 +340,8 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl 
	if (c->mtd->point) {

		unsigned long *wordebuf;



		ret = c->mtd->point(c->mtd, jeb->offset, c->sector_size,

				    &retlen, &ebuf, NULL);

		ret = mtd_point(c->mtd, jeb->offset, c->sector_size, &retlen,

				&ebuf, NULL);

		if (ret) {

			D1(printk(KERN_DEBUG "MTD point failed %d\n", ret));

			goto do_flash_read;

fs/jffs2/readinode.c

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info 
	/* TODO: instead, incapsulate point() stuff to jffs2_flash_read(),

	 * adding and jffs2_flash_read_end() interface. */

	if (c->mtd->point) {

		err = c->mtd->point(c->mtd, ofs, len, &retlen,

				    (void **)&buffer, NULL);

		err = mtd_point(c->mtd, ofs, len, &retlen, (void **)&buffer,

				NULL);

		if (!err && retlen < len) {

			JFFS2_WARNING("MTD point returned len too short: %zu instead of %u.\n", retlen, tn->csize);

			c->mtd->unpoint(c->mtd, ofs, retlen);

fs/jffs2/scan.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) 
	size_t pointlen, try_size;



	if (c->mtd->point) {

		ret = c->mtd->point(c->mtd, 0, c->mtd->size, &pointlen,

		ret = mtd_point(c->mtd, 0, c->mtd->size, &pointlen,

				(void **)&flashbuf, NULL);

		if (!ret && pointlen < c->mtd->size) {

			/* Don't muck about if it won't let us point to the whole flash */

include/linux/mtd/mtd.h

+10 −4
Original line number Diff line number Diff line
@@ -175,9 +175,6 @@ struct mtd_info { 
	 * wrappers instead.

	 */

	int (*erase) (struct mtd_info *mtd, struct erase_info *instr);



	/* This stuff for eXecute-In-Place */

	/* phys is optional and may be set to NULL */

	int (*point) (struct mtd_info *mtd, loff_t from, size_t len,

		      size_t *retlen, void **virt, resource_size_t *phys);
@@ -283,6 +280,15 @@ static inline int mtd_erase(struct mtd_info *mtd, struct erase_info *instr) 
	return mtd->erase(mtd, instr);

}



/*

 * This stuff for eXecute-In-Place. phys is optional and may be set to NULL.

 */

static inline int mtd_point(struct mtd_info *mtd, loff_t from, size_t len,

			    size_t *retlen, void **virt, resource_size_t *phys)

{

	return mtd->point(mtd, from, len, retlen, virt, phys);

}



static inline struct mtd_info *dev_to_mtd(struct device *dev)

{

	return dev ? dev_get_drvdata(dev) : NULL;