Some clean ups.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/direct/yaffs_attribs.c b/direct/yaffs_attribs.c
index 648e137374d143732c18574b07659440b003229d..767af962bbebb2894ccc0b5299e900361623d5ff 100644 (file)
--- a/direct/yaffs_attribs.c
+++ b/direct/yaffs_attribs.c
@@ -80,7 +80,7 @@ void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c)
 #endif
 }
 
-loff_t yaffs_get_file_size(struct yaffs_obj *obj)
+static Y_LOFF_T yaffs_get_file_size(struct yaffs_obj *obj)
 {
        YCHAR *alias = NULL;
        obj = yaffs_get_equivalent_obj(obj);

diff --git a/yaffs_mtdif_single.c b/yaffs_mtdif_single.c
index e61699d6e85f4475a2ddf87630c7161d0daec1a7..7b2ac36ffe5b07a8da746aaadb7111901f661de1 100644 (file)
--- a/yaffs_mtdif_single.c
+++ b/yaffs_mtdif_single.c
@@ -28,11 +28,6 @@
 #include "yaffs_linux.h"
 
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0))
-#define MTD_OPS_AUTO_OOB MTD_OOB_AUTO
-#endif
-
-
 int nandmtd_erase_block(struct yaffs_dev *dev, int block_no)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
@@ -103,12 +98,6 @@ static int yaffs_mtd_read(struct yaffs_dev *dev, int nand_chunk,
        ops.datbuf = data;
        ops.oobbuf = oob;
 
-#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20))
-       /* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug;
-        * help it out with ops.len = ops.ooblen when ops.datbuf == NULL.
-        */
-       ops.len = (ops.datbuf) ? ops.len : ops.ooblen;
-#endif
        /* Read page and oob using MTD.
         * Check status and determine ECC result.
         */