1 files changed, 21 insertions, 20 deletions

diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index a982889277c8..12fd7ebd3fd8 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -168,8 +168,8 @@ static int scan_header(partition_t *part)
          (offset + sizeof(header)) < max_offset;
          offset += part->mbd.mtd->erasesize ? : 0x2000) {
 
-        err = part->mbd.mtd->read(part->mbd.mtd, offset, sizeof(header), &ret,
-                              (unsigned char *)&header);
+        err = mtd_read(part->mbd.mtd, offset, sizeof(header), &ret,
+                       (unsigned char *)&header);
 
         if (err)
             return err;
@@ -224,8 +224,8 @@ static int build_maps(partition_t *part)
     for (i = 0; i < le16_to_cpu(part->header.NumEraseUnits); i++) {
         offset = ((i + le16_to_cpu(part->header.FirstPhysicalEUN))
                       << part->header.EraseUnitSize);
-        ret = part->mbd.mtd->read(part->mbd.mtd, offset, sizeof(header), &retval,
-                              (unsigned char *)&header);
+        ret = mtd_read(part->mbd.mtd, offset, sizeof(header), &retval,
+                       (unsigned char *)&header);
 
         if (ret)
             goto out_XferInfo;
@@ -289,9 +289,9 @@ static int build_maps(partition_t *part)
         part->EUNInfo[i].Deleted = 0;
         offset = part->EUNInfo[i].Offset + le32_to_cpu(header.BAMOffset);
 
-        ret = part->mbd.mtd->read(part->mbd.mtd, offset,
-                              part->BlocksPerUnit * sizeof(uint32_t), &retval,
-                              (unsigned char *)part->bam_cache);
+        ret = mtd_read(part->mbd.mtd, offset,
+                       part->BlocksPerUnit * sizeof(uint32_t), &retval,
+                       (unsigned char *)part->bam_cache);
 
         if (ret)
                 goto out_bam_cache;
@@ -485,9 +485,9 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit,
 
         offset = eun->Offset + le32_to_cpu(part->header.BAMOffset);
 
-        ret = part->mbd.mtd->read(part->mbd.mtd, offset,
-                              part->BlocksPerUnit * sizeof(uint32_t),
-                              &retlen, (u_char *) (part->bam_cache));
+        ret = mtd_read(part->mbd.mtd, offset,
+                       part->BlocksPerUnit * sizeof(uint32_t), &retlen,
+                       (u_char *)(part->bam_cache));
 
         /* mark the cache bad, in case we get an error later */
         part->bam_index = 0xffff;
@@ -523,8 +523,8 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit,
             break;
         case BLOCK_DATA:
         case BLOCK_REPLACEMENT:
-            ret = part->mbd.mtd->read(part->mbd.mtd, src, SECTOR_SIZE,
-                        &retlen, (u_char *) buf);
+            ret = mtd_read(part->mbd.mtd, src, SECTOR_SIZE, &retlen,
+                           (u_char *)buf);
             if (ret) {
                 printk(KERN_WARNING "ftl: Error reading old xfer unit in copy_erase_unit\n");
                 return ret;
@@ -747,10 +747,11 @@ static uint32_t find_free(partition_t *part)
         /* Invalidate cache */
         part->bam_index = 0xffff;
 
-        ret = part->mbd.mtd->read(part->mbd.mtd,
-                       part->EUNInfo[eun].Offset + le32_to_cpu(part->header.BAMOffset),
-                       part->BlocksPerUnit * sizeof(uint32_t),
-                       &retlen, (u_char *) (part->bam_cache));
+        ret = mtd_read(part->mbd.mtd,
+                       part->EUNInfo[eun].Offset + le32_to_cpu(part->header.BAMOffset),
+                       part->BlocksPerUnit * sizeof(uint32_t),
+                       &retlen,
+                       (u_char *)(part->bam_cache));
 
         if (ret) {
             printk(KERN_WARNING"ftl: Error reading BAM in find_free\n");
@@ -810,8 +811,8 @@ static int ftl_read(partition_t *part, caddr_t buffer,
         else {
             offset = (part->EUNInfo[log_addr / bsize].Offset
                           + (log_addr % bsize));
-            ret = part->mbd.mtd->read(part->mbd.mtd, offset, SECTOR_SIZE,
-                           &retlen, (u_char *) buffer);
+            ret = mtd_read(part->mbd.mtd, offset, SECTOR_SIZE, &retlen,
+                           (u_char *)buffer);
 
             if (ret) {
                 printk(KERN_WARNING "Error reading MTD device in ftl_read()\n");
@@ -849,8 +850,8 @@ static int set_bam_entry(partition_t *part, uint32_t log_addr,
                   le32_to_cpu(part->header.BAMOffset));
 
 #ifdef PSYCHO_DEBUG
-    ret = part->mbd.mtd->read(part->mbd.mtd, offset, sizeof(uint32_t),
-                        &retlen, (u_char *)&old_addr);
+    ret = mtd_read(part->mbd.mtd, offset, sizeof(uint32_t), &retlen,
+                   (u_char *)&old_addr);
     if (ret) {
         printk(KERN_WARNING"ftl: Error reading old_addr in set_bam_entry: %d\n",ret);
         return ret;