mtd: introduce mtd_read interface

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

1 files changed, 11 insertions, 6 deletions

diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index cda77b562ad4..1a9d9c1d3a74 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -423,12 +423,17 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                 if (BlockMap[block] == BLOCK_NIL)
                         continue;
 
-                ret = mtd->read(mtd, (nftl->EraseSize * BlockMap[block]) + (block * 512),
-                                512, &retlen, movebuf);
+                ret = mtd_read(mtd,
+                               (nftl->EraseSize * BlockMap[block]) + (block * 512),
+                               512,
+                               &retlen,
+                               movebuf);
                 if (ret < 0 && !mtd_is_bitflip(ret)) {
-                        ret = mtd->read(mtd, (nftl->EraseSize * BlockMap[block])
-                                        + (block * 512), 512, &retlen,
-                                        movebuf);
+                        ret = mtd_read(mtd,
+                                       (nftl->EraseSize * BlockMap[block]) + (block * 512),
+                                       512,
+                                       &retlen,
+                                       movebuf);
                         if (ret != -EIO)
                                 printk("Error went away on retry.\n");
                 }
@@ -771,7 +776,7 @@ static int nftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block,
         } else {
                 loff_t ptr = (lastgoodEUN * nftl->EraseSize) + blockofs;
                 size_t retlen;
-                int res = mtd->read(mtd, ptr, 512, &retlen, buffer);
+                int res = mtd_read(mtd, ptr, 512, &retlen, buffer);
 
                 if (res < 0 && !mtd_is_bitflip(res))
                         return -EIO;