Merge branch 'tegra/soc' into next/cleanup2

[cascardo/linux.git] / fs / jffs2 / scan.c

diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index 28107ca..f994648 100644 (file)
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -97,15 +97,15 @@ 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,
-                                   (void **)&flashbuf, NULL);
+               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 */
                        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)
+               if (ret && ret != -EOPNOTSUPP)
                        D1(printk(KERN_DEBUG "MTD point failed %d\n", ret));
        }
 #endif
@@ -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;
@@ -455,7 +455,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
        if (jffs2_cleanmarker_oob(c)) {
                int ret;
 
-               if (c->mtd->block_isbad(c->mtd, jeb->offset))
+               if (mtd_block_isbad(c->mtd, jeb->offset))
                        return BLK_STATE_BADBLOCK;
 
                ret = jffs2_check_nand_cleanmarker(c, jeb);