yaffs: More name changes

[yaffs2.git] / yaffs_mtd1f2_single.c

diff --git a/yaffs_mtdif2.c b/yaffs_mtd1f2_single.c
similarity index 85%
rename from yaffs_mtdif2.c
rename to yaffs_mtd1f2_single.c
index 1c60a444ca8597c2896f232760aa9913ab01167a..af54c184a06ef29ff14af199d322284ed25ecfe4 100644 (file)
--- a/yaffs_mtdif2.c
+++ b/yaffs_mtd1f2_single.c
@@ -35,11 +35,7 @@ int nandmtd2_write_chunk_tags(yaffs_dev_t *dev, int nand_chunk,
                                      const yaffs_ext_tags *tags)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
-#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
        struct mtd_oob_ops ops;
-#else
-       size_t dummy;
-#endif
        int retval = 0;
 
        loff_t addr;
@@ -70,7 +66,6 @@ int nandmtd2_write_chunk_tags(yaffs_dev_t *dev, int nand_chunk,
        } else
                yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc);
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
        ops.mode = MTD_OOB_AUTO;
        ops.ooblen = (dev->param.inband_tags) ? 0 : packed_tags_size;
        ops.len = dev->param.total_bytes_per_chunk;
@@ -79,17 +74,6 @@ int nandmtd2_write_chunk_tags(yaffs_dev_t *dev, int nand_chunk,
        ops.oobbuf = (dev->param.inband_tags) ? NULL : packed_tags_ptr;
        retval = mtd->write_oob(mtd, addr, &ops);
 
-#else
-       if (!dev->param.inband_tags) {
-               retval =
-                   mtd->write_ecc(mtd, addr, dev->data_bytes_per_chunk,
-                                  &dummy, data, (__u8 *) packed_tags_ptr, NULL);
-       } else {
-               retval =
-                   mtd->write(mtd, addr, dev->param.total_bytes_per_chunk, &dummy,
-                              data);
-       }
-#endif
 
        if (retval == 0)
                return YAFFS_OK;
@@ -101,9 +85,8 @@ int nandmtd2_read_chunk_tags(yaffs_dev_t *dev, int nand_chunk,
                                       __u8 *data, yaffs_ext_tags *tags)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
-#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
        struct mtd_oob_ops ops;
-#endif
+
        size_t dummy;
        int retval = 0;
        int local_data = 0;
@@ -131,7 +114,6 @@ int nandmtd2_read_chunk_tags(yaffs_dev_t *dev, int nand_chunk,
        }
 
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
        if (dev->param.inband_tags || (data && !tags))
                retval = mtd->read(mtd, addr, dev->param.total_bytes_per_chunk,
                                &dummy, data);
@@ -144,24 +126,6 @@ int nandmtd2_read_chunk_tags(yaffs_dev_t *dev, int nand_chunk,
                ops.oobbuf = yaffs_dev_to_lc(dev)->spare_buffer;
                retval = mtd->read_oob(mtd, addr, &ops);
        }
-#else
-       if (!dev->param.inband_tags && data && tags) {
-
-               retval = mtd->read_ecc(mtd, addr, dev->data_bytes_per_chunk,
-                                         &dummy, data, dev->spare_buffer,
-                                         NULL);
-       } else {
-               if (data)
-                       retval =
-                           mtd->read(mtd, addr, dev->data_bytes_per_chunk, &dummy,
-                                     data);
-               if (!dev->param.inband_tags && tags)
-                       retval =
-                           mtd->read_oob(mtd, addr, mtd->oobsize, &dummy,
-                                         dev->spare_buffer);
-       }
-#endif
-
 
        if (dev->param.inband_tags) {
                if (tags) {
@@ -253,4 +217,3 @@ int nandmtd2_query_block(struct yaffs_dev_s *dev, int block_no,
        else
                return YAFFS_FAIL;
 }
-