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

mtd: introduce mtd_unpoint interface 



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

drivers/mtd/mtdpart.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void part_unpoint(struct mtd_info *mtd, loff_t from, size_t len) 
{

	struct mtd_part *part = PART(mtd);



	part->master->unpoint(part->master, from + part->offset, len);

	mtd_unpoint(part->master, from + part->offset, len);

}



static unsigned long part_get_unmapped_area(struct mtd_info *mtd,

fs/jffs2/erase.c

+2 −2
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl 
		if (retlen < c->sector_size) {

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

			D1(printk(KERN_DEBUG "MTD point returned len too short: 0x%zx\n", retlen));

			c->mtd->unpoint(c->mtd, jeb->offset, retlen);

			mtd_unpoint(c->mtd, jeb->offset, retlen);

			goto do_flash_read;

		}

		wordebuf = ebuf-sizeof(*wordebuf);
@@ -358,7 +358,7 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl 
		   if (*++wordebuf != ~0)

			   break;

		} while(--retlen);

		c->mtd->unpoint(c->mtd, jeb->offset, c->sector_size);

		mtd_unpoint(c->mtd, jeb->offset, c->sector_size);

		if (retlen) {

			printk(KERN_WARNING "Newly-erased block contained word 0x%lx at offset 0x%08tx\n",

			       *wordebuf, jeb->offset + c->sector_size-retlen*sizeof(*wordebuf));

fs/jffs2/readinode.c

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info 
				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);

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

		} else if (err)

			JFFS2_WARNING("MTD point failed: error code %d.\n", err);

		else
@@ -101,7 +101,7 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info 
		kfree(buffer);

#ifndef __ECOS

	else

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

		mtd_unpoint(c->mtd, ofs, len);

#endif



	if (crc != tn->data_crc) {
@@ -137,7 +137,7 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info 
		kfree(buffer);

#ifndef __ECOS

	else

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

		mtd_unpoint(c->mtd, ofs, len);

#endif

	return err;

}

fs/jffs2/scan.c

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) 
		if (!ret && pointlen < c->mtd->size) {

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

			D1(printk(KERN_DEBUG "MTD point returned len too short: 0x%zx\n", pointlen));

			c->mtd->unpoint(c->mtd, 0, pointlen);

			mtd_unpoint(c->mtd, 0, pointlen);

			flashbuf = NULL;

		}

		if (ret)
@@ -273,7 +273,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c) 
		kfree(flashbuf);

#ifndef __ECOS

	else

		c->mtd->unpoint(c->mtd, 0, c->mtd->size);

		mtd_unpoint(c->mtd, 0, c->mtd->size);

#endif

	kfree(s);

	return ret;

include/linux/mtd/mtd.h

+6 −2
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ struct mtd_info { 
	int (*erase) (struct mtd_info *mtd, struct erase_info *instr);

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

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



	/* We probably shouldn't allow XIP if the unpoint isn't a NULL */

	void (*unpoint) (struct mtd_info *mtd, loff_t from, size_t len);



	/* Allow NOMMU mmap() to directly map the device (if not NULL)
@@ -289,6 +287,12 @@ static inline int mtd_point(struct mtd_info *mtd, loff_t from, size_t len, 
	return mtd->point(mtd, from, len, retlen, virt, phys);

}



/* We probably shouldn't allow XIP if the unpoint isn't a NULL */

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

{

	return mtd->unpoint(mtd, from, len);

}



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

{

	return dev ? dev_get_drvdata(dev) : NULL;