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, 12 insertions, 12 deletions

diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c
index 39de8727a52..d9fe2d0533d 100644
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
@@ -200,9 +200,9 @@ static int scan_header(struct partition *part)
                 part->sector_map[i] = -1;
 
         for (i=0, blocks_found=0; i<part->total_blocks; i++) {
-                rc = part->mbd.mtd->read(part->mbd.mtd,
-                                i * part->block_size, part->header_size,
-                                &retlen, (u_char*)part->header_cache);
+                rc = mtd_read(part->mbd.mtd, i * part->block_size,
+                              part->header_size, &retlen,
+                              (u_char *)part->header_cache);
 
                 if (!rc && retlen != part->header_size)
                         rc = -EIO;
@@ -250,8 +250,8 @@ static int rfd_ftl_readsect(struct mtd_blktrans_dev *dev, u_long sector, char *b
 
         addr = part->sector_map[sector];
         if (addr != -1) {
-                rc = part->mbd.mtd->read(part->mbd.mtd, addr, SECTOR_SIZE,
-                                                &retlen, (u_char*)buf);
+                rc = mtd_read(part->mbd.mtd, addr, SECTOR_SIZE, &retlen,
+                              (u_char *)buf);
                 if (!rc && retlen != SECTOR_SIZE)
                         rc = -EIO;
 
@@ -372,9 +372,8 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old
         if (!map)
                 goto err2;
 
-        rc = part->mbd.mtd->read(part->mbd.mtd,
-                part->blocks[block_no].offset, part->header_size,
-                &retlen, (u_char*)map);
+        rc = mtd_read(part->mbd.mtd, part->blocks[block_no].offset,
+                      part->header_size, &retlen, (u_char *)map);
 
         if (!rc && retlen != part->header_size)
                 rc = -EIO;
@@ -413,8 +412,8 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old
                         }
                         continue;
                 }
-                rc = part->mbd.mtd->read(part->mbd.mtd, addr,
-                        SECTOR_SIZE, &retlen, sector_data);
+                rc = mtd_read(part->mbd.mtd, addr, SECTOR_SIZE, &retlen,
+                              sector_data);
 
                 if (!rc && retlen != SECTOR_SIZE)
                         rc = -EIO;
@@ -563,8 +562,9 @@ static int find_writable_block(struct partition *part, u_long *old_sector)
                 }
         }
 
-        rc = part->mbd.mtd->read(part->mbd.mtd, part->blocks[block].offset,
-                part->header_size, &retlen, (u_char*)part->header_cache);
+        rc = mtd_read(part->mbd.mtd, part->blocks[block].offset,
+                      part->header_size, &retlen,
+                      (u_char *)part->header_cache);
 
         if (!rc && retlen != part->header_size)
                 rc = -EIO;