summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-01-30 15:08:26 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-03-27 00:19:21 +0100
commitf02654504dd24348ed28bc965527de99abaa4485 (patch)
treedbaa450069cb29bd175a13dbad730e0a4ac077af
parent570469f3bde7f71cc1ece07a18d54a05b6a8775d (diff)
downloadlinux-f02654504dd24348ed28bc965527de99abaa4485.tar.gz
linux-f02654504dd24348ed28bc965527de99abaa4485.tar.bz2
linux-f02654504dd24348ed28bc965527de99abaa4485.zip
jffs2: remove direct mtd->point reference
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>
-rw-r--r--fs/jffs2/scan.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index f99464833bb2..c02737375854 100644
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -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,