Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mtd: introduce mtd_point interface

Browse source 
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Artem Bityutskiy 2011-12-23 17:00:37 +02:00 committed by David Woodhouse
parent 7e1f0dc055
commit d35ea200c0
5 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/mtd/mtdpart.c
View file

@ -89,8 +89,8 @@ static int part_point(struct mtd_info *mtd, loff_t from, size_t len,
len = 0; len = 0;
else if (from + len > mtd->size) else if (from + len > mtd->size)
len = mtd->size - from; len = mtd->size - from;
return part->master->point (part->master, from + part->offset, return mtd_point(part->master, from + part->offset, len, retlen,
len, retlen, virt, phys); virt, phys);
} }
static void part_unpoint(struct mtd_info *mtd, loff_t from, size_t len) static void part_unpoint(struct mtd_info *mtd, loff_t from, size_t len)

4
fs/jffs2/erase.c
View file

@ -340,8 +340,8 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl
if (c->mtd->point) { if (c->mtd->point) {
unsigned long *wordebuf; unsigned long *wordebuf;
ret = c->mtd->point(c->mtd, jeb->offset, c->sector_size, ret = mtd_point(c->mtd, jeb->offset, c->sector_size, &retlen,
&retlen, &ebuf, NULL); &ebuf, NULL);
if (ret) { if (ret) {
D1(printk(KERN_DEBUG "MTD point failed %d\n", ret)); D1(printk(KERN_DEBUG "MTD point failed %d\n", ret));
goto do_flash_read; goto do_flash_read;

4
fs/jffs2/readinode.c
View file

@ -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(), /* TODO: instead, incapsulate point() stuff to jffs2_flash_read(),
* adding and jffs2_flash_read_end() interface. */ * adding and jffs2_flash_read_end() interface. */
if (c->mtd->point) { if (c->mtd->point) {
err = c->mtd->point(c->mtd, ofs, len, &retlen, err = mtd_point(c->mtd, ofs, len, &retlen, (void **)&buffer,
(void **)&buffer, NULL); NULL);
if (!err && retlen < len) { if (!err && retlen < len) {
JFFS2_WARNING("MTD point returned len too short: %zu instead of %u.\n", retlen, tn->csize); JFFS2_WARNING("MTD point returned len too short: %zu instead of %u.\n", retlen, tn->csize);
c->mtd->unpoint(c->mtd, ofs, retlen); c->mtd->unpoint(c->mtd, ofs, retlen);

4
fs/jffs2/scan.c
View file

@ -97,8 +97,8 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
size_t pointlen, try_size; size_t pointlen, try_size;
if (c->mtd->point) { 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); (void **)&flashbuf, NULL);
if (!ret && pointlen < c->mtd->size) { if (!ret && pointlen < c->mtd->size) {
/* Don't muck about if it won't let us point to the whole flash */ /* 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)); D1(printk(KERN_DEBUG "MTD point returned len too short: 0x%zx\n", pointlen));

14
include/linux/mtd/mtd.h
View file

@ -175,11 +175,8 @@ struct mtd_info {
* wrappers instead. * wrappers instead.
*/ */
int (*erase) (struct mtd_info *mtd, struct erase_info *instr); 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, int (*point) (struct mtd_info *mtd, loff_t from, size_t len,
size_t *retlen, void **virt, resource_size_t *phys); size_t *retlen, void **virt, resource_size_t *phys);
/* We probably shouldn't allow XIP if the unpoint isn't a NULL */ /* 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); void (*unpoint) (struct mtd_info *mtd, loff_t from, size_t len);
@ -283,6 +280,15 @@ static inline int mtd_erase(struct mtd_info *mtd, struct erase_info *instr)
return mtd->erase(mtd, 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) static inline struct mtd_info *dev_to_mtd(struct device *dev)
{ {
return dev ? dev_get_drvdata(dev) : NULL; return dev ? dev_get_drvdata(dev) : NULL;