1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
index 2ff601f816ce..4adc0374fb6b 100644
--- a/drivers/mtd/inftlmount.c
+++ b/drivers/mtd/inftlmount.c
@@ -73,8 +73,8 @@ static int find_boot_record(struct INFTLrecord *inftl)
                  * Check for BNAND header first. Then whinge if it's found
                  * but later checks fail.
                  */
-                ret = mtd->read(mtd, block * inftl->EraseSize,
-                                SECTORSIZE, &retlen, buf);
+                ret = mtd_read(mtd, block * inftl->EraseSize, SECTORSIZE,
+                               &retlen, buf);
                 /* We ignore ret in case the ECC of the MediaHeader is invalid
                    (which is apparently acceptable) */
                 if (retlen != SECTORSIZE) {
@@ -118,8 +118,8 @@ static int find_boot_record(struct INFTLrecord *inftl)
                 memcpy(mh, buf, sizeof(struct INFTLMediaHeader));
 
                 /* Read the spare media header at offset 4096 */
-                mtd->read(mtd, block * inftl->EraseSize + 4096,
-                          SECTORSIZE, &retlen, buf);
+                mtd_read(mtd, block * inftl->EraseSize + 4096, SECTORSIZE,
+                         &retlen, buf);
                 if (retlen != SECTORSIZE) {
                         printk(KERN_WARNING "INFTL: Unable to read spare "
                                "Media Header\n");
@@ -220,7 +220,7 @@ static int find_boot_record(struct INFTLrecord *inftl)
                                  */
                                 instr->addr = ip->Reserved0 * inftl->EraseSize;
                                 instr->len = inftl->EraseSize;
-                                mtd->erase(mtd, instr);
+                                mtd_erase(mtd, instr);
                         }
                         if ((ip->lastUnit - ip->firstUnit + 1) < ip->virtualUnits) {
                                 printk(KERN_WARNING "INFTL: Media Header "
@@ -306,7 +306,8 @@ static int find_boot_record(struct INFTLrecord *inftl)
                         /* If any of the physical eraseblocks are bad, don't
                            use the unit. */
                         for (physblock = 0; physblock < inftl->EraseSize; physblock += inftl->mbd.mtd->erasesize) {
-                                if (inftl->mbd.mtd->block_isbad(inftl->mbd.mtd, i * inftl->EraseSize + physblock))
+                                if (mtd_block_isbad(inftl->mbd.mtd,
+                                                    i * inftl->EraseSize + physblock))
                                         inftl->PUtable[i] = BLOCK_RESERVED;
                         }
                 }
@@ -342,7 +343,7 @@ static int check_free_sectors(struct INFTLrecord *inftl, unsigned int address,
         int i;
 
         for (i = 0; i < len; i += SECTORSIZE) {
-                if (mtd->read(mtd, address, SECTORSIZE, &retlen, buf))
+                if (mtd_read(mtd, address, SECTORSIZE, &retlen, buf))
                         return -1;
                 if (memcmpb(buf, 0xff, SECTORSIZE) != 0)
                         return -1;
@@ -393,7 +394,7 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)
            mark only the failed block in the bbt. */
         for (physblock = 0; physblock < inftl->EraseSize;
              physblock += instr->len, instr->addr += instr->len) {
-                mtd->erase(inftl->mbd.mtd, instr);
+                mtd_erase(inftl->mbd.mtd, instr);
 
                 if (instr->state == MTD_ERASE_FAILED) {
                         printk(KERN_WARNING "INFTL: error while formatting block %d\n",
@@ -423,7 +424,7 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)
 fail:
         /* could not format, update the bad block table (caller is responsible
            for setting the PUtable to BLOCK_RESERVED on failure) */
-        inftl->mbd.mtd->block_markbad(inftl->mbd.mtd, instr->addr);
+        mtd_block_markbad(inftl->mbd.mtd, instr->addr);
         return -1;
 }