Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 10934478e44d9a5a7b16dadd89094fb608cf101e

Authored by Artem Bityutskiy
Committed by David Woodhouse
1 parent fc002e3c32
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

mtd: do use mtd->point directly 

Remove direct usage of the "mtd->point" function pointer. Instead,
test the mtd_point() return code for '-EOPNOTSUPP'.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Showing 4 changed files with 15 additions and 16 deletions Side-by-side Diff

... ... @@ -336,12 +336,11 @@
336 336 uint32_t ofs;
337 337 size_t retlen;
338 338 int ret = -EIO;
  339 + unsigned long *wordebuf;
339 340  
340   - if (c->mtd->point) {
341   - unsigned long *wordebuf;
342   -
343   - ret = mtd_point(c->mtd, jeb->offset, c->sector_size, &retlen,
344   - &ebuf, NULL);
  341 + ret = mtd_point(c->mtd, jeb->offset, c->sector_size, &retlen,
  342 + &ebuf, NULL);
  343 + if (ret != -EOPNOTSUPP) {
345 344 if (ret) {
346 345 D1(printk(KERN_DEBUG "MTD point failed %d\n", ret));
347 346 goto do_flash_read;
fs/jffs2/readinode.c
Diff comments   View file @ 1093447
... ... @@ -62,17 +62,15 @@
62 62 #ifndef __ECOS
63 63 /* TODO: instead, incapsulate point() stuff to jffs2_flash_read(),
64 64 * adding and jffs2_flash_read_end() interface. */
65   - if (c->mtd->point) {
66   - err = mtd_point(c->mtd, ofs, len, &retlen, (void **)&buffer,
67   - NULL);
68   - if (!err && retlen < len) {
69   - JFFS2_WARNING("MTD point returned len too short: %zu instead of %u.\n", retlen, tn->csize);
70   - mtd_unpoint(c->mtd, ofs, retlen);
71   - } else if (err)
  65 + err = mtd_point(c->mtd, ofs, len, &retlen, (void **)&buffer, NULL);
  66 + if (!err && retlen < len) {
  67 + JFFS2_WARNING("MTD point returned len too short: %zu instead of %u.\n", retlen, tn->csize);
  68 + mtd_unpoint(c->mtd, ofs, retlen);
  69 + } else if (err) {
  70 + if (err != -EOPNOTSUPP)
72 71 JFFS2_WARNING("MTD point failed: error code %d.\n", err);
73   - else
74   - pointed = 1; /* succefully pointed to device */
75   - }
  72 + } else
  73 + pointed = 1; /* succefully pointed to device */
76 74 #endif
77 75  
78 76 if (!pointed) {
... ... @@ -105,7 +105,7 @@
105 105 mtd_unpoint(c->mtd, 0, pointlen);
106 106 flashbuf = NULL;
107 107 }
108   - if (ret)
  108 + if (ret && ret != -EOPNOTSUPP)
109 109 D1(printk(KERN_DEBUG "MTD point failed %d\n", ret));
110 110 }
111 111 #endif
include/linux/mtd/mtd.h
Diff comments   View file @ 1093447
... ... @@ -259,6 +259,8 @@
259 259 size_t *retlen, void **virt, resource_size_t *phys)
260 260 {
261 261 *retlen = 0;
  262 + if (!mtd->point)
  263 + return -EOPNOTSUPP;
262 264 return mtd->point(mtd, from, len, retlen, virt, phys);
263 265 }
264 266