mtd: introduce mtd_read interface
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:

committed by
David Woodhouse

parent
04c601bfa4
commit
329ad399a9
@@ -228,7 +228,7 @@ static int jffs2_verify_write(struct jffs2_sb_info *c, unsigned char *buf,
|
||||
size_t retlen;
|
||||
char *eccstr;
|
||||
|
||||
ret = c->mtd->read(c->mtd, ofs, c->wbuf_pagesize, &retlen, c->wbuf_verify);
|
||||
ret = mtd_read(c->mtd, ofs, c->wbuf_pagesize, &retlen, c->wbuf_verify);
|
||||
if (ret && ret != -EUCLEAN && ret != -EBADMSG) {
|
||||
printk(KERN_WARNING "jffs2_verify_write(): Read back of page at %08x failed: %d\n", c->wbuf_ofs, ret);
|
||||
return ret;
|
||||
@@ -337,7 +337,8 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c)
|
||||
}
|
||||
|
||||
/* Do the read... */
|
||||
ret = c->mtd->read(c->mtd, start, c->wbuf_ofs - start, &retlen, buf);
|
||||
ret = mtd_read(c->mtd, start, c->wbuf_ofs - start, &retlen,
|
||||
buf);
|
||||
|
||||
/* ECC recovered ? */
|
||||
if ((ret == -EUCLEAN || ret == -EBADMSG) &&
|
||||
@@ -948,11 +949,11 @@ int jffs2_flash_read(struct jffs2_sb_info *c, loff_t ofs, size_t len, size_t *re
|
||||
int ret;
|
||||
|
||||
if (!jffs2_is_writebuffered(c))
|
||||
return c->mtd->read(c->mtd, ofs, len, retlen, buf);
|
||||
return mtd_read(c->mtd, ofs, len, retlen, buf);
|
||||
|
||||
/* Read flash */
|
||||
down_read(&c->wbuf_sem);
|
||||
ret = c->mtd->read(c->mtd, ofs, len, retlen, buf);
|
||||
ret = mtd_read(c->mtd, ofs, len, retlen, buf);
|
||||
|
||||
if ( (ret == -EBADMSG || ret == -EUCLEAN) && (*retlen == len) ) {
|
||||
if (ret == -EBADMSG)
|
||||
|
Reference in New Issue
Block a user