[MTD] Remove read/write _ecc variants

MTD clients are agnostic of FLASH which needs ECC suppport.
Remove the functions and fixup the callers.

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

15 files changed, 209 insertions, 404 deletions

diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index 6f32942fdf77..d9ba1ee658f6 100644
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -584,8 +584,6 @@ void DoC2k_init(struct mtd_info *mtd)
         mtd->unpoint = NULL;
         mtd->read = doc_read;
         mtd->write = doc_write;
-        mtd->read_ecc = doc_read_ecc;
-        mtd->write_ecc = doc_write_ecc;
         mtd->read_oob = doc_read_oob;
         mtd->write_oob = doc_write_oob;
         mtd->sync = NULL;
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
index e6eaef28a2b0..579c0b570ae5 100644
--- a/drivers/mtd/devices/doc2001.c
+++ b/drivers/mtd/devices/doc2001.c
@@ -369,8 +369,6 @@ void DoCMil_init(struct mtd_info *mtd)
         mtd->unpoint = NULL;
         mtd->read = doc_read;
         mtd->write = doc_write;
-        mtd->read_ecc = doc_read_ecc;
-        mtd->write_ecc = doc_write_ecc;
         mtd->read_oob = doc_read_oob;
         mtd->write_oob = doc_write_oob;
         mtd->sync = NULL;
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c
index 8422c5e92d27..1ee0c0dcb53b 100644
--- a/drivers/mtd/devices/doc2001plus.c
+++ b/drivers/mtd/devices/doc2001plus.c
@@ -491,8 +491,6 @@ void DoCMilPlus_init(struct mtd_info *mtd)
         mtd->unpoint = NULL;
         mtd->read = doc_read;
         mtd->write = doc_write;
-        mtd->read_ecc = doc_read_ecc;
-        mtd->write_ecc = doc_write_ecc;
         mtd->read_oob = doc_read_oob;
         mtd->write_oob = doc_write_oob;
         mtd->sync = NULL;
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index a3b92479719d..ddd12993780d 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -36,6 +36,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/inftl.h>
+#include <linux/mtd/nand.h>
 #include <asm/uaccess.h>
 #include <asm/errno.h>
 #include <asm/io.h>
@@ -79,14 +80,12 @@ static void inftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
         inftl->mbd.devnum = -1;
         inftl->mbd.blksize = 512;
         inftl->mbd.tr = tr;
-        memcpy(&inftl->oobinfo, &mtd->oobinfo, sizeof(struct nand_oobinfo));
-        inftl->oobinfo.useecc = MTD_NANDECC_PLACEONLY;
 
-        if (INFTL_mount(inftl) < 0) {
+        if (INFTL_mount(inftl) < 0) {
                 printk(KERN_WARNING "INFTL: could not mount device\n");
                 kfree(inftl);
                 return;
-        }
+        }
 
         /* OK, it's a new one. Set up all the data structures. */
 
@@ -221,7 +220,7 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
          * Scan to find the Erase Unit which holds the actual data for each
          * 512-byte block within the Chain.
          */
-        silly = MAX_LOOPS;
+        silly = MAX_LOOPS;
         while (thisEUN < inftl->nb_blocks) {
                 for (block = 0; block < inftl->EraseSize/SECTORSIZE; block ++) {
                         if ((BlockMap[block] != 0xffff) || BlockDeleted[block])
@@ -232,7 +231,7 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
                              (char *)&oob) < 0)
                                 status = SECTOR_IGNORE;
                         else
-                                status = oob.b.Status | oob.b.Status1;
+                                status = oob.b.Status | oob.b.Status1;
 
                         switch(status) {
                         case SECTOR_FREE:
@@ -282,29 +281,30 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
                         continue;
                 }
 
-                /*
+                /*
                  * Copy only in non free block (free blocks can only
                  * happen in case of media errors or deleted blocks).
                  */
-                if (BlockMap[block] == BLOCK_NIL)
-                        continue;
+                if (BlockMap[block] == BLOCK_NIL)
+                        continue;
 
-                ret = MTD_READ(inftl->mbd.mtd, (inftl->EraseSize *
+                ret = MTD_READ(inftl->mbd.mtd, (inftl->EraseSize *
                         BlockMap[block]) + (block * SECTORSIZE), SECTORSIZE,
                         &retlen, movebuf);
-                if (ret < 0) {
+                if (ret < 0) {
                         ret = MTD_READ(inftl->mbd.mtd, (inftl->EraseSize *
                                 BlockMap[block]) + (block * SECTORSIZE),
                                 SECTORSIZE, &retlen, movebuf);
                         if (ret != -EIO)
-                                DEBUG(MTD_DEBUG_LEVEL1, "INFTL: error went "
-                                        "away on retry?\n");
-                }
-                memset(&oob, 0xff, sizeof(struct inftl_oob));
-                oob.b.Status = oob.b.Status1 = SECTOR_USED;
-                MTD_WRITEECC(inftl->mbd.mtd, (inftl->EraseSize * targetEUN) +
-                        (block * SECTORSIZE), SECTORSIZE, &retlen,
-                        movebuf, (char *)&oob, &inftl->oobinfo);
+                                DEBUG(MTD_DEBUG_LEVEL1, "INFTL: error went "
+                                      "away on retry?\n");
+                }
+                memset(&oob, 0xff, sizeof(struct inftl_oob));
+                oob.b.Status = oob.b.Status1 = SECTOR_USED;
+
+                nand_write_raw(inftl->mbd.mtd, (inftl->EraseSize * targetEUN) +
+                               (block * SECTORSIZE), SECTORSIZE, &retlen,
+                               movebuf, (char *)&oob);
         }
 
         /*
@@ -329,17 +329,17 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
                 if (thisEUN == targetEUN)
                         break;
 
-                if (INFTL_formatblock(inftl, thisEUN) < 0) {
+                if (INFTL_formatblock(inftl, thisEUN) < 0) {
                         /*
                          * Could not erase : mark block as reserved.
                          */
                         inftl->PUtable[thisEUN] = BLOCK_RESERVED;
-                } else {
+                } else {
                         /* Correctly erased : mark it as free */
                         inftl->PUtable[thisEUN] = BLOCK_FREE;
                         inftl->PUtable[prevEUN] = BLOCK_NIL;
                         inftl->numfreeEUNs++;
-                }
+                }
         }
 
         return targetEUN;
@@ -437,7 +437,7 @@ static inline u16 INFTL_findwriteunit(struct INFTLrecord *inftl, unsigned block)
                         MTD_READOOB(inftl->mbd.mtd, (thisEUN * inftl->EraseSize) +
                                 blockofs, 8, &retlen, (char *)&bci);
 
-                        status = bci.Status | bci.Status1;
+                        status = bci.Status | bci.Status1;
                         DEBUG(MTD_DEBUG_LEVEL3, "INFTL: status of block %d in "
                                 "EUN %d is %x\n", block , writeEUN, status);
 
@@ -670,12 +670,12 @@ static void INFTL_trydeletechain(struct INFTLrecord *inftl, unsigned thisVUC)
                 DEBUG(MTD_DEBUG_LEVEL3, "Deleting EUN %d from VUC %d\n",
                       thisEUN, thisVUC);
 
-                if (INFTL_formatblock(inftl, thisEUN) < 0) {
+                if (INFTL_formatblock(inftl, thisEUN) < 0) {
                         /*
                          * Could not erase : mark block as reserved.
                          */
                         inftl->PUtable[thisEUN] = BLOCK_RESERVED;
-                } else {
+                } else {
                         /* Correctly erased : mark it as free */
                         inftl->PUtable[thisEUN] = BLOCK_FREE;
                         inftl->numfreeEUNs++;
@@ -784,9 +784,10 @@ static int inftl_writeblock(struct mtd_blktrans_dev *mbd, unsigned long block,
 
                 memset(&oob, 0xff, sizeof(struct inftl_oob));
                 oob.b.Status = oob.b.Status1 = SECTOR_USED;
-                MTD_WRITEECC(inftl->mbd.mtd, (writeEUN * inftl->EraseSize) +
-                        blockofs, SECTORSIZE, &retlen, (char *)buffer,
-                        (char *)&oob, &inftl->oobinfo);
+
+                nand_write_raw(inftl->mbd.mtd, (writeEUN * inftl->EraseSize) +
+                               blockofs, SECTORSIZE, &retlen, (char *)buffer,
+                               (char *)&oob);
                 /*
                  * need to write SECTOR_USED flags since they are not written
                  * in mtd_writeecc
@@ -804,9 +805,9 @@ static int inftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block,
         struct INFTLrecord *inftl = (void *)mbd;
         unsigned int thisEUN = inftl->VUtable[block / (inftl->EraseSize / SECTORSIZE)];
         unsigned long blockofs = (block * SECTORSIZE) & (inftl->EraseSize - 1);
-        unsigned int status;
+        unsigned int status;
         int silly = MAX_LOOPS;
-        struct inftl_bci bci;
+        struct inftl_bci bci;
         size_t retlen;
 
         DEBUG(MTD_DEBUG_LEVEL3, "INFTL: inftl_readblock(inftl=%p,block=%ld,"
@@ -850,7 +851,7 @@ foundit:
                 /* The requested block is not on the media, return all 0x00 */
                 memset(buffer, 0, SECTORSIZE);
         } else {
-                size_t retlen;
+                size_t retlen;
                 loff_t ptr = (thisEUN * inftl->EraseSize) + blockofs;
                 if (MTD_READ(inftl->mbd.mtd, ptr, SECTORSIZE, &retlen,
                     buffer))
diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
index 43fdc9433882..f89a03795e76 100644
--- a/drivers/mtd/inftlmount.c
+++ b/drivers/mtd/inftlmount.c
@@ -350,21 +350,21 @@ static int check_free_sectors(struct INFTLrecord *inftl, unsigned int address,
         int len, int check_oob)
 {
         u8 buf[SECTORSIZE + inftl->mbd.mtd->oobsize];
+        struct mtd_info *mtd = inftl->mbd.mtd;
         size_t retlen;
         int i;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "INFTL: check_free_sectors(inftl=%p,"
-                "address=0x%x,len=%d,check_oob=%d)\n", inftl,
-                address, len, check_oob);
-
         for (i = 0; i < len; i += SECTORSIZE) {
-                if (MTD_READECC(inftl->mbd.mtd, address, SECTORSIZE, &retlen, buf, &buf[SECTORSIZE], &inftl->oobinfo) < 0)
+                if (mtd->read(mtd, address, SECTORSIZE, &retlen, buf))
                         return -1;
                 if (memcmpb(buf, 0xff, SECTORSIZE) != 0)
                         return -1;
 
                 if (check_oob) {
-                        if (memcmpb(buf + SECTORSIZE, 0xff, inftl->mbd.mtd->oobsize) != 0)
+                        if(mtd->read_oob(mtd, address, mtd->oobsize,
+                                         &retlen, &buf[SECTORSIZE]) < 0)
+                                return -1;
+                        if (memcmpb(buf + SECTORSIZE, 0xff, mtd->oobsize) != 0)
                                 return -1;
                 }
                 address += SECTORSIZE;
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index a6fcee2713b0..6d52137988fa 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -143,116 +143,6 @@ concat_write(struct mtd_info *mtd, loff_t to, size_t len,
 }
 
 static int
-concat_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
-                size_t * retlen, u_char * buf, u_char * eccbuf,
-                struct nand_oobinfo *oobsel)
-{
-        struct mtd_concat *concat = CONCAT(mtd);
-        int err = -EINVAL;
-        int i;
-
-        *retlen = 0;
-
-        for (i = 0; i < concat->num_subdev; i++) {
-                struct mtd_info *subdev = concat->subdev[i];
-                size_t size, retsize;
-
-                if (from >= subdev->size) {
-                        /* Not destined for this subdev */
-                        size = 0;
-                        from -= subdev->size;
-                        continue;
-                }
-
-                if (from + len > subdev->size)
-                        /* First part goes into this subdev */
-                        size = subdev->size - from;
-                else
-                        /* Entire transaction goes into this subdev */
-                        size = len;
-
-                if (subdev->read_ecc)
-                        err = subdev->read_ecc(subdev, from, size,
-                                               &retsize, buf, eccbuf, oobsel);
-                else
-                        err = -EINVAL;
-
-                if (err)
-                        break;
-
-                *retlen += retsize;
-                len -= size;
-                if (len == 0)
-                        break;
-
-                err = -EINVAL;
-                buf += size;
-                if (eccbuf) {
-                        eccbuf += subdev->oobsize;
-                        /* in nand.c at least, eccbufs are
-                           tagged with 2 (int)eccstatus'; we
-                           must account for these */
-                        eccbuf += 2 * (sizeof (int));
-                }
-                from = 0;
-        }
-        return err;
-}
-
-static int
-concat_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
-                 size_t * retlen, const u_char * buf, u_char * eccbuf,
-                 struct nand_oobinfo *oobsel)
-{
-        struct mtd_concat *concat = CONCAT(mtd);
-        int err = -EINVAL;
-        int i;
-
-        if (!(mtd->flags & MTD_WRITEABLE))
-                return -EROFS;
-
-        *retlen = 0;
-
-        for (i = 0; i < concat->num_subdev; i++) {
-                struct mtd_info *subdev = concat->subdev[i];
-                size_t size, retsize;
-
-                if (to >= subdev->size) {
-                        size = 0;
-                        to -= subdev->size;
-                        continue;
-                }
-                if (to + len > subdev->size)
-                        size = subdev->size - to;
-                else
-                        size = len;
-
-                if (!(subdev->flags & MTD_WRITEABLE))
-                        err = -EROFS;
-                else if (subdev->write_ecc)
-                        err = subdev->write_ecc(subdev, to, size,
-                                                &retsize, buf, eccbuf, oobsel);
-                else
-                        err = -EINVAL;
-
-                if (err)
-                        break;
-
-                *retlen += retsize;
-                len -= size;
-                if (len == 0)
-                        break;
-
-                err = -EINVAL;
-                buf += size;
-                if (eccbuf)
-                        eccbuf += subdev->oobsize;
-                to = 0;
-        }
-        return err;
-}
-
-static int
 concat_writev(struct mtd_info *mtd, const struct kvec *vecs,
                 unsigned long count, loff_t to, size_t * retlen)
 {
@@ -823,10 +713,6 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c
         concat->mtd.oobsize = subdev[0]->oobsize;
         concat->mtd.ecctype = subdev[0]->ecctype;
         concat->mtd.eccsize = subdev[0]->eccsize;
-        if (subdev[0]->read_ecc)
-                concat->mtd.read_ecc = concat_read_ecc;
-        if (subdev[0]->write_ecc)
-                concat->mtd.write_ecc = concat_write_ecc;
         if (subdev[0]->writev)
                 concat->mtd.writev = concat_writev;
         if (subdev[0]->read_oob)
@@ -869,8 +755,6 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c
                     concat->mtd.oobsize    !=  subdev[i]->oobsize ||
                     concat->mtd.ecctype    !=  subdev[i]->ecctype ||
                     concat->mtd.eccsize    !=  subdev[i]->eccsize ||
-                    !concat->mtd.read_ecc  != !subdev[i]->read_ecc ||
-                    !concat->mtd.write_ecc != !subdev[i]->write_ecc ||
                     !concat->mtd.read_oob  != !subdev[i]->read_oob ||
                     !concat->mtd.write_oob != !subdev[i]->write_oob) {
                         kfree(concat);
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index f418920320d2..a93550ce7978 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -55,12 +55,8 @@ static int part_read (struct mtd_info *mtd, loff_t from, size_t len,
                 len = 0;
         else if (from + len > mtd->size)
                 len = mtd->size - from;
-        if (part->master->read_ecc == NULL)
-                return part->master->read (part->master, from + part->offset,
-                                        len, retlen, buf);
-        else
-                return part->master->read_ecc (part->master, from + part->offset,
-                                        len, retlen, buf, NULL, &mtd->oobinfo);
+        return part->master->read (part->master, from + part->offset,
+                                   len, retlen, buf);
 }
 
 static int part_point (struct mtd_info *mtd, loff_t from, size_t len,
@@ -74,6 +70,7 @@ static int part_point (struct mtd_info *mtd, loff_t from, size_t len,
         return part->master->point (part->master, from + part->offset,
                                     len, retlen, buf);
 }
+
 static void part_unpoint (struct mtd_info *mtd, u_char *addr, loff_t from, size_t len)
 {
         struct mtd_part *part = PART(mtd);
@@ -81,21 +78,6 @@ static void part_unpoint (struct mtd_info *mtd, u_char *addr, loff_t from, size_
         part->master->unpoint (part->master, addr, from + part->offset, len);
 }
 
-
-static int part_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
-                        size_t *retlen, u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel)
-{
-        struct mtd_part *part = PART(mtd);
-        if (oobsel == NULL)
-                oobsel = &mtd->oobinfo;
-        if (from >= mtd->size)
-                len = 0;
-        else if (from + len > mtd->size)
-                len = mtd->size - from;
-        return part->master->read_ecc (part->master, from + part->offset,
-                                        len, retlen, buf, eccbuf, oobsel);
-}
-
 static int part_read_oob (struct mtd_info *mtd, loff_t from, size_t len,
                         size_t *retlen, u_char *buf)
 {
@@ -148,30 +130,8 @@ static int part_write (struct mtd_info *mtd, loff_t to, size_t len,
                 len = 0;
         else if (to + len > mtd->size)
                 len = mtd->size - to;
-        if (part->master->write_ecc == NULL)
-                return part->master->write (part->master, to + part->offset,
-                                        len, retlen, buf);
-        else
-                return part->master->write_ecc (part->master, to + part->offset,
-                                        len, retlen, buf, NULL, &mtd->oobinfo);
-
-}
-
-static int part_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
-                        size_t *retlen, const u_char *buf,
-                         u_char *eccbuf, struct nand_oobinfo *oobsel)
-{
-        struct mtd_part *part = PART(mtd);
-        if (!(mtd->flags & MTD_WRITEABLE))
-                return -EROFS;
-        if (oobsel == NULL)
-                oobsel = &mtd->oobinfo;
-        if (to >= mtd->size)
-                len = 0;
-        else if (to + len > mtd->size)
-                len = mtd->size - to;
-        return part->master->write_ecc (part->master, to + part->offset,
-                                        len, retlen, buf, eccbuf, oobsel);
+        return part->master->write (part->master, to + part->offset,
+                                    len, retlen, buf);
 }
 
 static int part_write_oob (struct mtd_info *mtd, loff_t to, size_t len,
@@ -372,10 +332,6 @@ int add_mtd_partitions(struct mtd_info *master,
                         slave->mtd.unpoint = part_unpoint;
                 }
 
-                if (master->read_ecc)
-                        slave->mtd.read_ecc = part_read_ecc;
-                if (master->write_ecc)
-                        slave->mtd.write_ecc = part_write_ecc;
                 if (master->read_oob)
                         slave->mtd.read_oob = part_read_oob;
                 if (master->write_oob)
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index da2f4d16e506..d796eb508b4f 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -139,16 +139,10 @@ static int nand_verify_buf(struct mtd_info *mtd, const uint8_t *buf, int len);
 
 static int nand_read(struct mtd_info *mtd, loff_t from, size_t len,
                      size_t *retlen, uint8_t *buf);
-static int nand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
-                         size_t *retlen, uint8_t *buf, uint8_t *eccbuf,
-                         struct nand_oobinfo *oobsel);
 static int nand_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
                          size_t *retlen, uint8_t *buf);
 static int nand_write(struct mtd_info *mtd, loff_t to, size_t len,
                       size_t *retlen, const uint8_t *buf);
-static int nand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
-                          size_t *retlen, const uint8_t *buf, uint8_t *eccbuf,
-                          struct nand_oobinfo *oobsel);
 static int nand_write_oob(struct mtd_info *mtd, loff_t to, size_t len,
                           size_t *retlen, const uint8_t *buf);
 static int nand_erase(struct mtd_info *mtd, struct erase_info *instr);
@@ -1080,27 +1074,6 @@ static int nand_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retl
 }
 
 /**
- * nand_read_ecc - [MTD Interface] MTD compability function for nand_do_read_ecc
- * @mtd:        MTD device structure
- * @from:       offset to read from
- * @len:        number of bytes to read
- * @retlen:     pointer to variable to store the number of read bytes
- * @buf:        the databuffer to put data
- * @oob_buf:    filesystem supplied oob data buffer
- * @oobsel:     oob selection structure
- *
- * This function simply calls nand_do_read_ecc with flags = 0xff
- */
-static int nand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
-                         size_t *retlen, uint8_t *buf, uint8_t *oob_buf, struct nand_oobinfo *oobsel)
-{
-        /* use userspace supplied oobinfo, if zero */
-        if (oobsel == NULL)
-                oobsel = &mtd->oobinfo;
-        return nand_do_read_ecc(mtd, from, len, retlen, buf, oob_buf, oobsel, 0xff);
-}
-
-/**
  * nand_do_read_ecc - [MTD Interface] Read data with ECC
  * @mtd:        MTD device structure
  * @from:       offset to read from
@@ -1524,6 +1497,55 @@ int nand_read_raw(struct mtd_info *mtd, uint8_t *buf, loff_t from, size_t len, s
 }
 
 /**
+ * nand_write_raw - [GENERIC] Write raw data including oob
+ * @mtd:        MTD device structure
+ * @buf:        source buffer
+ * @to:         offset to write to
+ * @len:        number of bytes to write
+ * @buf:        source buffer
+ * @oob:        oob buffer
+ *
+ * Write raw data including oob
+ */
+int nand_write_raw(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen,
+                   uint8_t *buf, uint8_t *oob)
+{
+        struct nand_chip *this = mtd->priv;
+        int page = (int)(to >> this->page_shift);
+        int chip = (int)(to >> this->chip_shift);
+        int ret;
+
+        *retlen = 0;
+
+        /* Do not allow writes past end of device */
+        if ((to + len) > mtd->size) {
+                DEBUG(MTD_DEBUG_LEVEL0, "nand_read_raw: Attempt write "
+                      "beyond end of device\n");
+                return -EINVAL;
+        }
+
+        /* Grab the lock and see if the device is available */
+        nand_get_device(this, mtd, FL_WRITING);
+
+        this->select_chip(mtd, chip);
+        this->data_poi = buf;
+
+        while (len != *retlen) {
+                ret = nand_write_page(mtd, this, page, oob, &mtd->oobinfo, 0);
+                if (ret)
+                        return ret;
+                page++;
+                *retlen += mtd->writesize;
+                this->data_poi += mtd->writesize;
+                oob += mtd->oobsize;
+        }
+
+        /* Deselect and wake up anyone waiting on the device */
+        nand_release_device(mtd);
+        return 0;
+}
+
+/**
  * nand_prepare_oobbuf - [GENERIC] Prepare the out of band buffer
  * @mtd:        MTD device structure
  * @fsbuf:      buffer given by fs driver
@@ -1585,57 +1607,39 @@ static uint8_t *nand_prepare_oobbuf(struct mtd_info *mtd, uint8_t *fsbuf, struct
 #define NOTALIGNED(x) (x & (mtd->writesize-1)) != 0
 
 /**
- * nand_write - [MTD Interface] compability function for nand_write_ecc
- * @mtd:        MTD device structure
- * @to:         offset to write to
- * @len:        number of bytes to write
- * @retlen:     pointer to variable to store the number of written bytes
- * @buf:        the data to write
- *
- * This function simply calls nand_write_ecc with oob buffer and oobsel = NULL
- *
-*/
-static int nand_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const uint8_t *buf)
-{
-        return (nand_write_ecc(mtd, to, len, retlen, buf, NULL, NULL));
-}
-
-/**
- * nand_write_ecc - [MTD Interface] NAND write with ECC
+ * nand_write - [MTD Interface] NAND write with ECC
  * @mtd:        MTD device structure
  * @to:         offset to write to
  * @len:        number of bytes to write
  * @retlen:     pointer to variable to store the number of written bytes
  * @buf:        the data to write
- * @eccbuf:     filesystem supplied oob data buffer
- * @oobsel:     oob selection structure
  *
  * NAND write with ECC
  */
-static int nand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
-                          size_t *retlen, const uint8_t *buf, uint8_t *eccbuf,
-                          struct nand_oobinfo *oobsel)
+static int nand_write(struct mtd_info *mtd, loff_t to, size_t len,
+                          size_t *retlen, const uint8_t *buf)
 {
         int startpage, page, ret = -EIO, oob = 0, written = 0, chipnr;
         int autoplace = 0, numpages, totalpages;
         struct nand_chip *this = mtd->priv;
-        uint8_t *oobbuf, *bufstart;
+        uint8_t *oobbuf, *bufstart, *eccbuf = NULL;
         int ppblock = (1 << (this->phys_erase_shift - this->page_shift));
+        struct nand_oobinfo *oobsel = &mtd->oobinfo;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "nand_write_ecc: to = 0x%08x, len = %i\n", (unsigned int)to, (int)len);
+        DEBUG(MTD_DEBUG_LEVEL3, "nand_write: to = 0x%08x, len = %i\n", (unsigned int)to, (int)len);
 
         /* Initialize retlen, in case of early exit */
         *retlen = 0;
 
         /* Do not allow write past end of device */
         if ((to + len) > mtd->size) {
-                DEBUG(MTD_DEBUG_LEVEL0, "nand_write_ecc: Attempt to write past end of page\n");
+                DEBUG(MTD_DEBUG_LEVEL0, "nand_write: Attempt to write past end of page\n");
                 return -EINVAL;
         }
 
         /* reject writes, which are not page aligned */
         if (NOTALIGNED(to) || NOTALIGNED(len)) {
-                printk(KERN_NOTICE "nand_write_ecc: Attempt to write not page aligned data\n");
+                printk(KERN_NOTICE "nand_write: Attempt to write not page aligned data\n");
                 return -EINVAL;
         }
 
@@ -1651,10 +1655,6 @@ static int nand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
         if (nand_check_wp(mtd))
                 goto out;
 
-        /* if oobsel is NULL, use chip defaults */
-        if (oobsel == NULL)
-                oobsel = &mtd->oobinfo;
-
         /* Autoplace of oob data ? Use the default placement scheme */
         if (oobsel->useecc == MTD_NANDECC_AUTOPLACE) {
                 oobsel = this->autooob;
@@ -1689,7 +1689,7 @@ static int nand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
                  */
                 ret = nand_write_page(mtd, this, page, &oobbuf[oob], oobsel, (--numpages > 0));
                 if (ret) {
-                        DEBUG(MTD_DEBUG_LEVEL0, "nand_write_ecc: write_page failed %d\n", ret);
+                        DEBUG(MTD_DEBUG_LEVEL0, "nand_write: write_page failed %d\n", ret);
                         goto out;
                 }
                 /* Next oob page */
@@ -1712,7 +1712,7 @@ static int nand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
                         ret = nand_verify_pages(mtd, this, startpage, page - startpage,
                                                 oobbuf, oobsel, chipnr, (eccbuf != NULL));
                         if (ret) {
-                                DEBUG(MTD_DEBUG_LEVEL0, "nand_write_ecc: verify_pages failed %d\n", ret);
+                                DEBUG(MTD_DEBUG_LEVEL0, "nand_write: verify_pages failed %d\n", ret);
                                 goto out;
                         }
                         *retlen = written;
@@ -1741,7 +1741,7 @@ static int nand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
         if (!ret)
                 *retlen = written;
         else
-                DEBUG(MTD_DEBUG_LEVEL0, "nand_write_ecc: verify_pages failed %d\n", ret);
+                DEBUG(MTD_DEBUG_LEVEL0, "nand_write: verify_pages failed %d\n", ret);
 
  out:
         /* Deselect and wake up anyone waiting on the device */
@@ -2527,8 +2527,6 @@ int nand_scan(struct mtd_info *mtd, int maxchips)
         mtd->unpoint = NULL;
         mtd->read = nand_read;
         mtd->write = nand_write;
-        mtd->read_ecc = nand_read_ecc;
-        mtd->write_ecc = nand_write_ecc;
         mtd->read_oob = nand_read_oob;
         mtd->write_oob = nand_write_oob;
         mtd->sync = nand_sync;
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index fbccb2a25186..ecaaca18d1e0 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -156,7 +156,7 @@ static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num,
 
         while (totlen) {
                 len = min(totlen, (size_t) (1 << this->bbt_erase_shift));
-                res = mtd->read_ecc(mtd, from, len, &retlen, buf, NULL, this->autooob);
+                res = mtd->read(mtd, from, len, &retlen, buf);
                 if (res < 0) {
                         if (retlen != len) {
                                 printk(KERN_INFO "nand_bbt: Error reading bad block table\n");
@@ -471,17 +471,17 @@ static int search_read_bbts(struct mtd_info *mtd, uint8_t * buf, struct nand_bbt
  *
 */
 static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
-                     struct nand_bbt_descr *td, struct nand_bbt_descr *md, int chipsel)
+                     struct nand_bbt_descr *td, struct nand_bbt_descr *md,
+                     int chipsel)
 {
         struct nand_chip *this = mtd->priv;
-        struct nand_oobinfo oobinfo;
         struct erase_info einfo;
         int i, j, res, chip = 0;
         int bits, startblock, dir, page, offs, numblocks, sft, sftmsk;
-        int nrchips, bbtoffs, pageoffs;
+        int nrchips, bbtoffs, pageoffs, ooboffs;
         uint8_t msk[4];
         uint8_t rcode = td->reserved_block_code;
-        size_t retlen, len = 0;
+        size_t retlen, len = 0, ooblen;
         loff_t to;
 
         if (!rcode)
@@ -526,12 +526,14 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
                 for (i = 0; i < td->maxblocks; i++) {
                         int block = startblock + dir * i;
                         /* Check, if the block is bad */
-                        switch ((this->bbt[block >> 2] >> (2 * (block & 0x03))) & 0x03) {
+                        switch ((this->bbt[block >> 2] >>
+                                 (2 * (block & 0x03))) & 0x03) {
                         case 0x01:
                         case 0x03:
                                 continue;
                         }
-                        page = block << (this->bbt_erase_shift - this->page_shift);
+                        page = block <<
+                                (this->bbt_erase_shift - this->page_shift);
                         /* Check, if the block is used by the mirror table */
                         if (!md || md->pages[chip] != page)
                                 goto write;
@@ -542,11 +544,20 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
 
                 /* Set up shift count and masks for the flash table */
                 bits = td->options & NAND_BBT_NRBITS_MSK;
+                msk[2] = ~rcode;
                 switch (bits) {
-                case 1: sft = 3; sftmsk = 0x07; msk[0] = 0x00; msk[1] = 0x01; msk[2] = ~rcode; msk[3] = 0x01; break;
-                case 2: sft = 2; sftmsk = 0x06; msk[0] = 0x00; msk[1] = 0x01; msk[2] = ~rcode; msk[3] = 0x03; break;
-                case 4: sft = 1; sftmsk = 0x04; msk[0] = 0x00; msk[1] = 0x0C; msk[2] = ~rcode; msk[3] = 0x0f; break;
-                case 8: sft = 0; sftmsk = 0x00; msk[0] = 0x00; msk[1] = 0x0F; msk[2] = ~rcode; msk[3] = 0xff; break;
+                case 1: sft = 3; sftmsk = 0x07; msk[0] = 0x00; msk[1] = 0x01;
+                        msk[3] = 0x01;
+                        break;
+                case 2: sft = 2; sftmsk = 0x06; msk[0] = 0x00; msk[1] = 0x01;
+                        msk[3] = 0x03;
+                        break;
+                case 4: sft = 1; sftmsk = 0x04; msk[0] = 0x00; msk[1] = 0x0C;
+                        msk[3] = 0x0f;
+                        break;
+                case 8: sft = 0; sftmsk = 0x00; msk[0] = 0x00; msk[1] = 0x0F;
+                        msk[3] = 0xff;
+                        break;
                 default: return -EINVAL;
                 }
 
@@ -554,49 +565,55 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
 
                 to = ((loff_t) page) << this->page_shift;
 
-                memcpy(&oobinfo, this->autooob, sizeof(oobinfo));
-                oobinfo.useecc = MTD_NANDECC_PLACEONLY;
-
                 /* Must we save the block contents ? */
                 if (td->options & NAND_BBT_SAVECONTENT) {
                         /* Make it block aligned */
                         to &= ~((loff_t) ((1 << this->bbt_erase_shift) - 1));
                         len = 1 << this->bbt_erase_shift;
-                        res = mtd->read_ecc(mtd, to, len, &retlen, buf, &buf[len], &oobinfo);
+                        res = mtd->read(mtd, to, len, &retlen, buf);
                         if (res < 0) {
                                 if (retlen != len) {
-                                        printk(KERN_INFO
-                                               "nand_bbt: Error reading block for writing the bad block table\n");
+                                        printk(KERN_INFO "nand_bbt: Error "
+                                               "reading block for writing "
+                                               "the bad block table\n");
                                         return res;
                                 }
-                                printk(KERN_WARNING "nand_bbt: ECC error while reading block for writing bad block table\n");
+                                printk(KERN_WARNING "nand_bbt: ECC error "
+                                       "while reading block for writing "
+                                       "bad block table\n");
                         }
+                        /* Read oob data */
+                        ooblen = (len >> this->page_shift) * mtd->oobsize;
+                        res = mtd->read_oob(mtd, to + mtd->writesize, ooblen,
+                                            &retlen, &buf[len]);
+                        if (res < 0 || retlen != ooblen)
+                                goto outerr;
+
                         /* Calc the byte offset in the buffer */
                         pageoffs = page - (int)(to >> this->page_shift);
                         offs = pageoffs << this->page_shift;
                         /* Preset the bbt area with 0xff */
                         memset(&buf[offs], 0xff, (size_t) (numblocks >> sft));
-                        /* Preset the bbt's oob area with 0xff */
-                        memset(&buf[len + pageoffs * mtd->oobsize], 0xff,
-                               ((len >> this->page_shift) - pageoffs) * mtd->oobsize);
-                        if (td->options & NAND_BBT_VERSION) {
-                                buf[len + (pageoffs * mtd->oobsize) + td->veroffs] = td->version[chip];
-                        }
+                        ooboffs = len + (pageoffs * mtd->oobsize);
+
                 } else {
                         /* Calc length */
                         len = (size_t) (numblocks >> sft);
                         /* Make it page aligned ! */
-                        len = (len + (mtd->writesize - 1)) & ~(mtd->writesize - 1);
+                        len = (len + (mtd->writesize - 1)) &
+                                ~(mtd->writesize - 1);
                         /* Preset the buffer with 0xff */
-                        memset(buf, 0xff, len + (len >> this->page_shift) * mtd->oobsize);
+                        memset(buf, 0xff, len +
+                               (len >> this->page_shift)* mtd->oobsize);
                         offs = 0;
+                        ooboffs = len;
                         /* Pattern is located in oob area of first page */
-                        memcpy(&buf[len + td->offs], td->pattern, td->len);
-                        if (td->options & NAND_BBT_VERSION) {
-                                buf[len + td->veroffs] = td->version[chip];
-                        }
+                        memcpy(&buf[ooboffs + td->offs], td->pattern, td->len);
                 }
 
+                if (td->options & NAND_BBT_VERSION)
+                        buf[ooboffs + td->veroffs] = td->version[chip];
+
                 /* walk through the memory table */
                 for (i = 0; i < numblocks;) {
                         uint8_t dat;
@@ -604,7 +621,8 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
                         for (j = 0; j < 4; j++, i++) {
                                 int sftcnt = (i << (3 - sft)) & sftmsk;
                                 /* Do not store the reserved bbt blocks ! */
-                                buf[offs + (i >> sft)] &= ~(msk[dat & 0x03] << sftcnt);
+                                buf[offs + (i >> sft)] &=
+                                        ~(msk[dat & 0x03] << sftcnt);
                                 dat >>= 2;
                         }
                 }
@@ -614,23 +632,25 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
                 einfo.addr = (unsigned long)to;
                 einfo.len = 1 << this->bbt_erase_shift;
                 res = nand_erase_nand(mtd, &einfo, 1);
-                if (res < 0) {
-                        printk(KERN_WARNING "nand_bbt: Error during block erase: %d\n", res);
-                        return res;
-                }
+                if (res < 0)
+                        goto outerr;
 
-                res = mtd->write_ecc(mtd, to, len, &retlen, buf, &buf[len], &oobinfo);
-                if (res < 0) {
-                        printk(KERN_WARNING "nand_bbt: Error while writing bad block table %d\n", res);
-                        return res;
-                }
-                printk(KERN_DEBUG "Bad block table written to 0x%08x, version 0x%02X\n",
-                       (unsigned int)to, td->version[chip]);
+                res = nand_write_raw(mtd, to, len, &retlen, buf, &buf[len]);
+                if (res < 0)
+                        goto outerr;
+
+                printk(KERN_DEBUG "Bad block table written to 0x%08x, version "
+                       "0x%02X\n", (unsigned int)to, td->version[chip]);
 
                 /* Mark it as used */
                 td->pages[chip] = page;
         }
         return 0;
+
+ outerr:
+        printk(KERN_WARNING
+               "nand_bbt: Error while writing bad block table %d\n", res);
+        return res;
 }
 
 /**
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index d7cd5fa16ba4..dd03349946c2 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -70,8 +70,6 @@ static void nftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
         nftl->mbd.devnum = -1;
         nftl->mbd.blksize = 512;
         nftl->mbd.tr = tr;
-        memcpy(&nftl->oobinfo, &mtd->oobinfo, sizeof(struct nand_oobinfo));
-        nftl->oobinfo.useecc = MTD_NANDECC_PLACEONLY;
 
         if (NFTL_mount(nftl) < 0) {
                 printk(KERN_WARNING "NFTL: could not mount device\n");
@@ -369,8 +367,11 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                 }
                 memset(&oob, 0xff, sizeof(struct nftl_oob));
                 oob.b.Status = oob.b.Status1 = SECTOR_USED;
-                MTD_WRITEECC(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) + (block * 512),
-                             512, &retlen, movebuf, (char *)&oob, &nftl->oobinfo);
+
+                nand_write_raw(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) +
+                               (block * 512), 512, &retlen, movebuf,
+                               (char *)&oob);
+
         }
 
         /* add the header so that it is now a valid chain */
@@ -639,10 +640,10 @@ static int nftl_writeblock(struct mtd_blktrans_dev *mbd, unsigned long block,
 
         memset(&oob, 0xff, sizeof(struct nftl_oob));
         oob.b.Status = oob.b.Status1 = SECTOR_USED;
-        MTD_WRITEECC(nftl->mbd.mtd, (writeEUN * nftl->EraseSize) + blockofs,
-                     512, &retlen, (char *)buffer, (char *)&oob, &nftl->oobinfo);
-        /* need to write SECTOR_USED flags since they are not written in mtd_writeecc */
 
+        nand_write_raw(nftl->mbd.mtd, (writeEUN * nftl->EraseSize) +
+                       blockofs, 512, &retlen, (char *)buffer,
+                       (char *)&oob);
         return 0;
 }
 #endif /* CONFIG_NFTL_RW */
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
index 3b104ebb219a..90e5e7e97fdc 100644
--- a/drivers/mtd/nftlmount.c
+++ b/drivers/mtd/nftlmount.c
@@ -268,18 +268,22 @@ static int memcmpb(void *a, int c, int n)
 static int check_free_sectors(struct NFTLrecord *nftl, unsigned int address, int len,
                               int check_oob)
 {
-        int i;
-        size_t retlen;
         u8 buf[SECTORSIZE + nftl->mbd.mtd->oobsize];
+        struct mtd_info *mtd = nftl->mbd.mtd;
+        size_t retlen;
+        int i;
 
         for (i = 0; i < len; i += SECTORSIZE) {
-                if (MTD_READECC(nftl->mbd.mtd, address, SECTORSIZE, &retlen, buf, &buf[SECTORSIZE], &nftl->oobinfo) < 0)
+                if (mtd->read(mtd, address, SECTORSIZE, &retlen, buf))
                         return -1;
                 if (memcmpb(buf, 0xff, SECTORSIZE) != 0)
                         return -1;
 
                 if (check_oob) {
-                        if (memcmpb(buf + SECTORSIZE, 0xff, nftl->mbd.mtd->oobsize) != 0)
+                        if(mtd->read_oob(mtd, address, mtd->oobsize,
+                                         &retlen, &buf[SECTORSIZE]) < 0)
+                                return -1;
+                        if (memcmpb(buf + SECTORSIZE, 0xff, mtd->oobsize) != 0)
                                 return -1;
                 }
                 address += SECTORSIZE;
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 3a3fe1d8fcdd..7a2419186ff4 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -597,31 +597,28 @@ static void onenand_release_device(struct mtd_info *mtd)
 }
 
 /**
- * onenand_read_ecc - [MTD Interface] Read data with ECC
+ * onenand_read - [MTD Interface] Read data from flash
  * @param mtd           MTD device structure
  * @param from          offset to read from
  * @param len           number of bytes to read
  * @param retlen        pointer to variable to store the number of read bytes
  * @param buf           the databuffer to put data
- * @param oob_buf       filesystem supplied oob data buffer
- * @param oobsel        oob selection structure
  *
- * OneNAND read with ECC
- */
-static int onenand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
-        size_t *retlen, u_char *buf,
-        u_char *oob_buf, struct nand_oobinfo *oobsel)
+ * Read with ecc
+*/
+static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
+        size_t *retlen, u_char *buf)
 {
         struct onenand_chip *this = mtd->priv;
         int read = 0, column;
         int thislen;
         int ret = 0;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_read_ecc: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
+        DEBUG(MTD_DEBUG_LEVEL3, "onenand_read: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
 
         /* Do not allow reads past end of device */
         if ((from + len) > mtd->size) {
-                DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_ecc: Attempt read beyond end of device\n");
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_read: Attempt read beyond end of device\n");
                 *retlen = 0;
                 return -EINVAL;
         }
@@ -654,7 +651,7 @@ static int onenand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
                         break;
 
                 if (ret) {
-                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_ecc: read failed = %d\n", ret);
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_read: read failed = %d\n", ret);
                         goto out;
                 }
 
@@ -676,22 +673,6 @@ out:
 }
 
 /**
- * onenand_read - [MTD Interface] MTD compability function for onenand_read_ecc
- * @param mtd           MTD device structure
- * @param from          offset to read from
- * @param len           number of bytes to read
- * @param retlen        pointer to variable to store the number of read bytes
- * @param buf           the databuffer to put data
- *
- * This function simply calls onenand_read_ecc with oob buffer and oobsel = NULL
-*/
-static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
-        size_t *retlen, u_char *buf)
-{
-        return onenand_read_ecc(mtd, from, len, retlen, buf, NULL, NULL);
-}
-
-/**
  * onenand_read_oob - [MTD Interface] OneNAND read out-of-band
  * @param mtd           MTD device structure
  * @param from          offset to read from
@@ -834,39 +815,36 @@ static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr)
 #define NOTALIGNED(x)   ((x & (mtd->writesize - 1)) != 0)
 
 /**
- * onenand_write_ecc - [MTD Interface] OneNAND write with ECC
+ * onenand_write - [MTD Interface] write buffer to FLASH
  * @param mtd           MTD device structure
  * @param to            offset to write to
  * @param len           number of bytes to write
  * @param retlen        pointer to variable to store the number of written bytes
  * @param buf           the data to write
- * @param eccbuf        filesystem supplied oob data buffer
- * @param oobsel        oob selection structure
  *
- * OneNAND write with ECC
+ * Write with ECC
  */
-static int onenand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
-        size_t *retlen, const u_char *buf,
-        u_char *eccbuf, struct nand_oobinfo *oobsel)
+static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,
+        size_t *retlen, const u_char *buf)
 {
         struct onenand_chip *this = mtd->priv;
         int written = 0;
         int ret = 0;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_write_ecc: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
+        DEBUG(MTD_DEBUG_LEVEL3, "onenand_write: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
 
         /* Initialize retlen, in case of early exit */
         *retlen = 0;
 
         /* Do not allow writes past end of device */
         if (unlikely((to + len) > mtd->size)) {
-                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: Attempt write to past end of device\n");
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: Attempt write to past end of device\n");
                 return -EINVAL;
         }
 
         /* Reject writes, which are not page aligned */
         if (unlikely(NOTALIGNED(to)) || unlikely(NOTALIGNED(len))) {
-                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: Attempt to write not page aligned data\n");
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: Attempt to write not page aligned data\n");
                 return -EINVAL;
         }
 
@@ -888,7 +866,7 @@ static int onenand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
 
                 ret = this->wait(mtd, FL_WRITING);
                 if (ret) {
-                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: write filaed %d\n", ret);
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: write filaed %d\n", ret);
                         goto out;
                 }
 
@@ -897,7 +875,7 @@ static int onenand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
                 /* Only check verify write turn on */
                 ret = onenand_verify_page(mtd, (u_char *) buf, to);
                 if (ret) {
-                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: verify failed %d\n", ret);
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: verify failed %d\n", ret);
                         goto out;
                 }
 
@@ -918,23 +896,6 @@ out:
 }
 
 /**
- * onenand_write - [MTD Interface] compability function for onenand_write_ecc
- * @param mtd           MTD device structure
- * @param to            offset to write to
- * @param len           number of bytes to write
- * @param retlen        pointer to variable to store the number of written bytes
- * @param buf           the data to write
- *
- * This function simply calls onenand_write_ecc
- * with oob buffer and oobsel = NULL
- */
-static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,
-        size_t *retlen, const u_char *buf)
-{
-        return onenand_write_ecc(mtd, to, len, retlen, buf, NULL, NULL);
-}
-
-/**
  * onenand_write_oob - [MTD Interface] OneNAND write out-of-band
  * @param mtd           MTD device structure
  * @param to            offset to write to
@@ -1812,8 +1773,6 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
         mtd->unpoint = NULL;
         mtd->read = onenand_read;
         mtd->write = onenand_write;
-        mtd->read_ecc = onenand_read_ecc;
-        mtd->write_ecc = onenand_write_ecc;
         mtd->read_oob = onenand_read_oob;
         mtd->write_oob = onenand_write_oob;
 #ifdef CONFIG_MTD_ONENAND_OTP
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index 916c87d3393b..76d4c361ef1f 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -233,10 +233,7 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c)
                 }
 
                 /* Do the read... */
-                if (jffs2_cleanmarker_oob(c))
-                        ret = c->mtd->read_ecc(c->mtd, start, c->wbuf_ofs - start, &retlen, buf, NULL, c->oobinfo);
-                else
-                        ret = c->mtd->read(c->mtd, start, c->wbuf_ofs - start, &retlen, buf);
+                ret = c->mtd->read(c->mtd, start, c->wbuf_ofs - start, &retlen, buf);
 
                 if (ret == -EBADMSG && retlen == c->wbuf_ofs - start) {
                         /* ECC recovered */
@@ -290,16 +287,13 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c)
                 if (breakme++ == 20) {
                         printk(KERN_NOTICE "Faking write error at 0x%08x\n", ofs);
                         breakme = 0;
-                        c->mtd->write_ecc(c->mtd, ofs, towrite, &retlen,
-                                          brokenbuf, NULL, c->oobinfo);
+                        c->mtd->write(c->mtd, ofs, towrite, &retlen,
+                                      brokenbuf);
                         ret = -EIO;
                 } else
 #endif
-                if (jffs2_cleanmarker_oob(c))
-                        ret = c->mtd->write_ecc(c->mtd, ofs, towrite, &retlen,
-                                                rewrite_buf, NULL, c->oobinfo);
-                else
-                        ret = c->mtd->write(c->mtd, ofs, towrite, &retlen, rewrite_buf);
+                        ret = c->mtd->write(c->mtd, ofs, towrite, &retlen,
+                                            rewrite_buf);
 
                 if (ret || retlen != towrite) {
                         /* Argh. We tried. Really we did. */
@@ -457,15 +451,12 @@ static int __jffs2_flush_wbuf(struct jffs2_sb_info *c, int pad)
         if (breakme++ == 20) {
                 printk(KERN_NOTICE "Faking write error at 0x%08x\n", c->wbuf_ofs);
                 breakme = 0;
-                c->mtd->write_ecc(c->mtd, c->wbuf_ofs, c->wbuf_pagesize,
-                                        &retlen, brokenbuf, NULL, c->oobinfo);
+                c->mtd->write(c->mtd, c->wbuf_ofs, c->wbuf_pagesize, &retlen,
+                              brokenbuf);
                 ret = -EIO;
         } else
 #endif
 
-        if (jffs2_cleanmarker_oob(c))
-                ret = c->mtd->write_ecc(c->mtd, c->wbuf_ofs, c->wbuf_pagesize, &retlen, c->wbuf, NULL, c->oobinfo);
-        else
                 ret = c->mtd->write(c->mtd, c->wbuf_ofs, c->wbuf_pagesize, &retlen, c->wbuf);
 
         if (ret || retlen != c->wbuf_pagesize) {
@@ -800,10 +791,7 @@ int jffs2_flash_read(struct jffs2_sb_info *c, loff_t ofs, size_t len, size_t *re
 
         /* Read flash */
         down_read(&c->wbuf_sem);
-        if (jffs2_cleanmarker_oob(c))
-                ret = c->mtd->read_ecc(c->mtd, ofs, len, retlen, buf, NULL, c->oobinfo);
-        else
-                ret = c->mtd->read(c->mtd, ofs, len, retlen, buf);
+        ret = c->mtd->read(c->mtd, ofs, len, retlen, buf);
 
         if ( (ret == -EBADMSG) && (*retlen == len) ) {
                 printk(KERN_WARNING "mtd->read(0x%zx bytes from 0x%llx) returned ECC error\n",
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index af89e529b8d2..b8ad634391db 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -115,9 +115,6 @@ struct mtd_info {
         int (*read) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);
         int (*write) (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf);
 
-        int (*read_ecc) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel);
-        int (*write_ecc) (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel);
-
         int (*read_oob) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);
         int (*write_oob) (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf);
 
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 6931376ed68d..8362b466df3a 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -36,6 +36,9 @@ extern int nand_read_raw (struct mtd_info *mtd, uint8_t *buf, loff_t from,
                           size_t len, size_t ooblen);
 
 
+extern int nand_write_raw(struct mtd_info *mtd, loff_t to, size_t len,
+                          size_t *retlen, uint8_t *buf, uint8_t *oob);
+
 /* The maximum number of NAND chips in an array */
 #define NAND_MAX_CHIPS          8