[MTD] Remove silly MTD_WRITE/READ macros

Most of those macros are unused and the used ones just obfuscate
the code. Remove them and fixup all users.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

9 files changed, 195 insertions, 179 deletions

diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index ddd12993780d..3396f0e1ac5f 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -197,10 +197,11 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
         u16 BlockMap[MAX_SECTORS_PER_UNIT];
         unsigned char BlockDeleted[MAX_SECTORS_PER_UNIT];
         unsigned int thisEUN, prevEUN, status;
+        struct mtd_info *mtd = inftl->mbd.mtd;
         int block, silly;
         unsigned int targetEUN;
         struct inftl_oob oob;
-        size_t retlen;
+        size_t retlen;
 
         DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
                 "pending=%d)\n", inftl, thisVUC, pendingblock);
@@ -226,9 +227,9 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
                         if ((BlockMap[block] != 0xffff) || BlockDeleted[block])
                                 continue;
 
-                        if (MTD_READOOB(inftl->mbd.mtd, (thisEUN * inftl->EraseSize)
-                             + (block * SECTORSIZE), 16 , &retlen,
-                             (char *)&oob) < 0)
+                        if (mtd->read_oob(mtd, (thisEUN * inftl->EraseSize)
+                                          + (block * SECTORSIZE), 16 , &retlen,
+                                          (char *)&oob) < 0)
                                 status = SECTOR_IGNORE;
                         else
                                 status = oob.b.Status | oob.b.Status1;
@@ -288,13 +289,14 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
                 if (BlockMap[block] == BLOCK_NIL)
                         continue;
 
-                ret = MTD_READ(inftl->mbd.mtd, (inftl->EraseSize *
-                        BlockMap[block]) + (block * SECTORSIZE), SECTORSIZE,
-                        &retlen, movebuf);
+                ret = mtd->read(mtd, (inftl->EraseSize * BlockMap[block]) +
+                                (block * SECTORSIZE), SECTORSIZE, &retlen,
+                                movebuf);
                 if (ret < 0) {
-                        ret = MTD_READ(inftl->mbd.mtd, (inftl->EraseSize *
-                                BlockMap[block]) + (block * SECTORSIZE),
-                                SECTORSIZE, &retlen, movebuf);
+                        ret = mtd->read(mtd,
+                                        (inftl->EraseSize * BlockMap[block]) +
+                                        (block * SECTORSIZE), SECTORSIZE,
+                                        &retlen, movebuf);
                         if (ret != -EIO)
                                 DEBUG(MTD_DEBUG_LEVEL1, "INFTL: error went "
                                       "away on retry?\n");
@@ -415,6 +417,7 @@ static inline u16 INFTL_findwriteunit(struct INFTLrecord *inftl, unsigned block)
         unsigned int thisVUC = block / (inftl->EraseSize / SECTORSIZE);
         unsigned int thisEUN, writeEUN, prev_block, status;
         unsigned long blockofs = (block * SECTORSIZE) & (inftl->EraseSize -1);
+        struct mtd_info *mtd = inftl->mbd.mtd;
         struct inftl_oob oob;
         struct inftl_bci bci;
         unsigned char anac, nacs, parity;
@@ -434,8 +437,8 @@ static inline u16 INFTL_findwriteunit(struct INFTLrecord *inftl, unsigned block)
                 silly = MAX_LOOPS;
 
                 while (thisEUN <= inftl->lastEUN) {
-                        MTD_READOOB(inftl->mbd.mtd, (thisEUN * inftl->EraseSize) +
-                                blockofs, 8, &retlen, (char *)&bci);
+                        mtd->read_oob(mtd, (thisEUN * inftl->EraseSize) +
+                                      blockofs, 8, &retlen, (char *)&bci);
 
                         status = bci.Status | bci.Status1;
                         DEBUG(MTD_DEBUG_LEVEL3, "INFTL: status of block %d in "
@@ -522,8 +525,8 @@ hitused:
                 nacs = 0;
                 thisEUN = inftl->VUtable[thisVUC];
                 if (thisEUN != BLOCK_NIL) {
-                        MTD_READOOB(inftl->mbd.mtd, thisEUN * inftl->EraseSize
-                                + 8, 8, &retlen, (char *)&oob.u);
+                        mtd->read_oob(mtd, thisEUN * inftl->EraseSize
+                                      + 8, 8, &retlen, (char *)&oob.u);
                         anac = oob.u.a.ANAC + 1;
                         nacs = oob.u.a.NACs + 1;
                 }
@@ -544,8 +547,8 @@ hitused:
                 oob.u.a.parityPerField = parity;
                 oob.u.a.discarded = 0xaa;
 
-                MTD_WRITEOOB(inftl->mbd.mtd, writeEUN * inftl->EraseSize + 8, 8,
-                        &retlen, (char *)&oob.u);
+                mtd->write_oob(mtd, writeEUN * inftl->EraseSize + 8, 8,
+                               &retlen, (char *)&oob.u);
 
                 /* Also back up header... */
                 oob.u.b.virtualUnitNo = cpu_to_le16(thisVUC);
@@ -555,8 +558,8 @@ hitused:
                 oob.u.b.parityPerField = parity;
                 oob.u.b.discarded = 0xaa;
 
-                MTD_WRITEOOB(inftl->mbd.mtd, writeEUN * inftl->EraseSize +
-                        SECTORSIZE * 4 + 8, 8, &retlen, (char *)&oob.u);
+                mtd->write_oob(mtd, writeEUN * inftl->EraseSize +
+                               SECTORSIZE * 4 + 8, 8, &retlen, (char *)&oob.u);
 
                 inftl->PUtable[writeEUN] = inftl->VUtable[thisVUC];
                 inftl->VUtable[thisVUC] = writeEUN;
@@ -576,6 +579,7 @@ hitused:
  */
 static void INFTL_trydeletechain(struct INFTLrecord *inftl, unsigned thisVUC)
 {
+        struct mtd_info *mtd = inftl->mbd.mtd;
         unsigned char BlockUsed[MAX_SECTORS_PER_UNIT];
         unsigned char BlockDeleted[MAX_SECTORS_PER_UNIT];
         unsigned int thisEUN, status;
@@ -606,9 +610,9 @@ static void INFTL_trydeletechain(struct INFTLrecord *inftl, unsigned thisVUC)
                         if (BlockUsed[block] || BlockDeleted[block])
                                 continue;
 
-                        if (MTD_READOOB(inftl->mbd.mtd, (thisEUN * inftl->EraseSize)
-                            + (block * SECTORSIZE), 8 , &retlen,
-                            (char *)&bci) < 0)
+                        if (mtd->read_oob(mtd, (thisEUN * inftl->EraseSize)
+                                          + (block * SECTORSIZE), 8 , &retlen,
+                                          (char *)&bci) < 0)
                                 status = SECTOR_IGNORE;
                         else
                                 status = bci.Status | bci.Status1;
@@ -697,6 +701,7 @@ static int INFTL_deleteblock(struct INFTLrecord *inftl, unsigned block)
 {
         unsigned int thisEUN = inftl->VUtable[block / (inftl->EraseSize / SECTORSIZE)];
         unsigned long blockofs = (block * SECTORSIZE) & (inftl->EraseSize - 1);
+        struct mtd_info *mtd = inftl->mbd.mtd;
         unsigned int status;
         int silly = MAX_LOOPS;
         size_t retlen;
@@ -706,8 +711,8 @@ static int INFTL_deleteblock(struct INFTLrecord *inftl, unsigned block)
                 "block=%d)\n", inftl, block);
 
         while (thisEUN < inftl->nb_blocks) {
-                if (MTD_READOOB(inftl->mbd.mtd, (thisEUN * inftl->EraseSize) +
-                    blockofs, 8, &retlen, (char *)&bci) < 0)
+                if (mtd->read_oob(mtd, (thisEUN * inftl->EraseSize) +
+                                  blockofs, 8, &retlen, (char *)&bci) < 0)
                         status = SECTOR_IGNORE;
                 else