10 files changed, 5 insertions, 21 deletions

diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index 603a7951ac9b..8a0c4dec6351 100644
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -569,7 +569,6 @@ void DoC2k_init(struct mtd_info *mtd)
 
         mtd->type = MTD_NANDFLASH;
         mtd->flags = MTD_CAP_NANDFLASH;
-        mtd->ecctype = MTD_ECC_RS_DiskOnChip;
         mtd->size = 0;
         mtd->erasesize = 0;
         mtd->writesize = 512;
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
index 0e2a9326f717..22a3b9e6aaaf 100644
--- a/drivers/mtd/devices/doc2001.c
+++ b/drivers/mtd/devices/doc2001.c
@@ -349,7 +349,6 @@ void DoCMil_init(struct mtd_info *mtd)
 
         mtd->type = MTD_NANDFLASH;
         mtd->flags = MTD_CAP_NANDFLASH;
-        mtd->ecctype = MTD_ECC_RS_DiskOnChip;
         mtd->size = 0;
 
         /* FIXME: erase size is not always 8KiB */
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c
index 92dbb47f2ac3..01185593b2c2 100644
--- a/drivers/mtd/devices/doc2001plus.c
+++ b/drivers/mtd/devices/doc2001plus.c
@@ -473,7 +473,6 @@ void DoCMilPlus_init(struct mtd_info *mtd)
 
         mtd->type = MTD_NANDFLASH;
         mtd->flags = MTD_CAP_NANDFLASH;
-        mtd->ecctype = MTD_ECC_RS_DiskOnChip;
         mtd->size = 0;
 
         mtd->erasesize = 0;
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 3013d0883b97..3731523ec11f 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -419,8 +419,9 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 info.erasesize  = mtd->erasesize;
                 info.writesize  = mtd->writesize;
                 info.oobsize    = mtd->oobsize;
-                info.ecctype    = mtd->ecctype;
-                info.eccsize    = mtd->eccsize;
+                /* The below fields are obsolete */
+                info.ecctype    = -1;
+                info.eccsize    = 0;
                 if (copy_to_user(argp, &info, sizeof(struct mtd_info_user)))
                         return -EFAULT;
                 break;
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 06902683bc2a..880580c44e01 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -727,8 +727,6 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c
         concat->mtd.erasesize = subdev[0]->erasesize;
         concat->mtd.writesize = subdev[0]->writesize;
         concat->mtd.oobsize = subdev[0]->oobsize;
-        concat->mtd.ecctype = subdev[0]->ecctype;
-        concat->mtd.eccsize = subdev[0]->eccsize;
         if (subdev[0]->writev)
                 concat->mtd.writev = concat_writev;
         if (subdev[0]->read_oob)
@@ -774,8 +772,6 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c
                 if (concat->mtd.writesize   !=  subdev[i]->writesize ||
                     concat->mtd.subpage_sft != subdev[i]->subpage_sft ||
                     concat->mtd.oobsize    !=  subdev[i]->oobsize ||
-                    concat->mtd.ecctype    !=  subdev[i]->ecctype ||
-                    concat->mtd.eccsize    !=  subdev[i]->eccsize ||
                     !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 bafd2fba87bd..633def3fb087 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -338,8 +338,6 @@ int add_mtd_partitions(struct mtd_info *master,
                 slave->mtd.size = parts[i].size;
                 slave->mtd.writesize = master->writesize;
                 slave->mtd.oobsize = master->oobsize;
-                slave->mtd.ecctype = master->ecctype;
-                slave->mtd.eccsize = master->eccsize;
                 slave->mtd.subpage_sft = master->subpage_sft;
 
                 slave->mtd.name = parts[i].name;
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index c13d66426360..acaf97bc80d1 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2566,7 +2566,6 @@ int nand_scan_tail(struct mtd_info *mtd)
         /* Fill in remaining MTD driver data */
         mtd->type = MTD_NANDFLASH;
         mtd->flags = MTD_CAP_NANDFLASH;
-        mtd->ecctype = MTD_ECC_SW;
         mtd->erase = nand_erase;
         mtd->point = NULL;
         mtd->unpoint = NULL;
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index a7645794364c..a2342ddc62e7 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -2373,7 +2373,6 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
         /* Fill in remaining MTD driver data */
         mtd->type = MTD_NANDFLASH;
         mtd->flags = MTD_CAP_NANDFLASH;
-        mtd->ecctype = MTD_ECC_SW;
         mtd->erase = onenand_erase;
         mtd->point = NULL;
         mtd->unpoint = NULL;
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index afab253ad60e..8a2e8bfc1e56 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -117,8 +117,6 @@ struct mtd_info {
         u_int32_t writesize;
 
         u_int32_t oobsize;   // Amount of OOB data per block (e.g. 16)
-        u_int32_t ecctype;
-        u_int32_t eccsize;
 
         // Kernel-only stuff starts here.
         char *name;
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index f913c30d7b89..8e501a75a764 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -36,12 +36,6 @@ struct mtd_oob_buf {
 #define MTD_CAP_NORFLASH        (MTD_WRITEABLE | MTD_BIT_WRITEABLE)
 #define MTD_CAP_NANDFLASH       (MTD_WRITEABLE)
 
-
-// Types of automatic ECC/Checksum available
-#define MTD_ECC_NONE            0       // No automatic ECC available
-#define MTD_ECC_RS_DiskOnChip   1       // Automatic ECC on DiskOnChip
-#define MTD_ECC_SW              2       // SW ECC for Toshiba & Samsung devices
-
 /* ECC byte placement */
 #define MTD_NANDECC_OFF         0       // Switch off ECC (Not recommended)
 #define MTD_NANDECC_PLACE       1       // Use the given placement in the structure (YAFFS1 legacy mode)
@@ -61,6 +55,8 @@ struct mtd_info_user {
         uint32_t erasesize;
         uint32_t writesize;
         uint32_t oobsize;   // Amount of OOB data per block (e.g. 16)
+        /* The below two fields are obsolete and broken, do not use them
+         * (TODO: remove at some point) */
         uint32_t ecctype;
         uint32_t eccsize;
 };