OSDN Git Service

jffs2: remove direct mtd->point reference
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Mon, 30 Jan 2012 13:08:26 +0000 (15:08 +0200)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 26 Mar 2012 23:19:21 +0000 (00:19 +0100)
Commit 10934478e44d9a5a7b16dadd89094fb608cf101e did not remove now useless
"if (mtd->point)" check mistakingly - let's kill it now.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
fs/jffs2/scan.c

index f994648..c027373 100644 (file)
@@ -96,18 +96,16 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
 #ifndef __ECOS
        size_t pointlen, try_size;
 
-       if (c->mtd->point) {
-               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));
-                       mtd_unpoint(c->mtd, 0, pointlen);
-                       flashbuf = NULL;
-               }
-               if (ret && ret != -EOPNOTSUPP)
-                       D1(printk(KERN_DEBUG "MTD point failed %d\n", ret));
+       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));
+               mtd_unpoint(c->mtd, 0, pointlen);
+               flashbuf = NULL;
        }
+       if (ret && ret != -EOPNOTSUPP)
+               D1(printk(KERN_DEBUG "MTD point failed %d\n", ret));
 #endif
        if (!flashbuf) {
                /* For NAND it's quicker to read a whole eraseblock at a time,