X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_mtdif2_single.c;h=f92c49faecffed8d614599a680af9a7db9479cc7;hp=4218b6e3de272e61b4d1a9440a2b20966a7eae5d;hb=80d031a7c6cbfc952e9646c5cc3c838ddb4d073f;hpb=472c70456396a6f2019bfabe83bd292782dbd978;ds=sidebyside

diff --git a/yaffs_mtdif2_single.c b/yaffs_mtdif2_single.c
index 4218b6e..f92c49f 100644
--- a/yaffs_mtdif2_single.c
+++ b/yaffs_mtdif2_single.c
@@ -21,6 +21,7 @@
 #include "linux/mtd/mtd.h"
 #include "linux/types.h"
 #include "linux/time.h"
+#include "mtd/mtd-abi.h"
 
 
 /* NB For use with inband tags....
@@ -64,7 +65,7 @@ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 		yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc);
 	}
 
-	ops.mode = MTD_OOB_AUTO;
+	ops.mode = MTD_OPS_AUTO_OOB;
 	ops.ooblen = (dev->param.inband_tags) ? 0 : packed_tags_size;
 	ops.len = dev->param.total_bytes_per_chunk;
 	ops.ooboffs = 0;
@@ -99,14 +100,14 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 
 	if (dev->param.inband_tags && !data) {
 		local_data = 1;
-		data = yaffs_get_temp_buffer(dev, __LINE__);
+		data = yaffs_get_temp_buffer(dev);
 	}
 
 	if (dev->param.inband_tags || (data && !tags)) {
 		retval = mtd->read(mtd, addr, dev->param.total_bytes_per_chunk,
 				   &dummy, data);
 	} else if (tags) {
-		ops.mode = MTD_OOB_AUTO;
+		ops.mode = MTD_OPS_AUTO_OOB;
 		ops.ooblen = packed_tags_size;
 		ops.len = data ? dev->data_bytes_per_chunk : packed_tags_size;
 		ops.ooboffs = 0;
@@ -130,7 +131,7 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 	}
 
 	if (local_data)
-		yaffs_release_temp_buffer(dev, data, __LINE__);
+		yaffs_release_temp_buffer(dev, data);
 
 	if (tags && retval == -EBADMSG &&
 	    tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {