X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_vfs_multi.c;h=322f9819c3f47fef498b25e382aa8822ecea96a3;hp=ce41d6c81d8150a0ad59a70fec185c2645d167c7;hb=9edb962fd286e9f9a6fb2fd97a2317a1c29d64b0;hpb=4d8ae2ff95b889fd2ea14a7e33ec934e4386ee57

diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c
index ce41d6c..322f981 100644
--- a/yaffs_vfs_multi.c
+++ b/yaffs_vfs_multi.c
@@ -176,8 +176,6 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size)
 #include "yaffs_linux.h"
 
 #include "yaffs_mtdif.h"
-#include "yaffs_mtdif1.h"
-#include "yaffs_mtdif2.h"
 
 unsigned int yaffs_trace_mask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS;
 unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS;
@@ -2831,14 +2829,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
 	/* Set up the memory size parameters.... */
 
-	n_blocks =
-	    YCALCBLOCKS(mtd->size,
-			(YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK));
 
-	param->start_block = 0;
-	param->end_block = n_blocks - 1;
-	param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK;
-	param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK;
 	param->n_reserved_blocks = 5;
 	param->n_caches = (options.no_cache) ? 0 : 10;
 	param->inband_tags = options.inband_tags;
@@ -2861,12 +2852,6 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 
 	/* ... and the functions. */
 	if (yaffs_version == 2) {
-		param->write_chunk_tags_fn = nandmtd2_write_chunk_tags;
-		param->read_chunk_tags_fn = nandmtd2_read_chunk_tags;
-		param->bad_block_fn = nandmtd2_mark_block_bad;
-		param->query_block_fn = nandmtd2_query_block;
-		yaffs_dev_to_lc(dev)->spare_buffer =
-				kmalloc(mtd->oobsize, GFP_NOFS);
 		param->is_yaffs2 = 1;
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
 		param->total_bytes_per_chunk = mtd->writesize;
@@ -2880,21 +2865,18 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
 		param->start_block = 0;
 		param->end_block = n_blocks - 1;
 	} else {
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
-		/* use the MTD interface in yaffs_mtdif1.c */
-		param->write_chunk_tags_fn = nandmtd1_write_chunk_tags;
-		param->read_chunk_tags_fn = nandmtd1_read_chunk_tags;
-		param->bad_block_fn = nandmtd1_mark_block_bad;
-		param->query_block_fn = nandmtd1_query_block;
-#else
-		param->write_chunk_fn = nandmtd_write_chunk;
-		param->read_chunk_fn = nandmtd_read_chunk;
-#endif
 		param->is_yaffs2 = 0;
+		n_blocks = YCALCBLOCKS(mtd->size,
+			     YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK);
+
+		param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK;
+		param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK;
 	}
-	/* ... and common functions */
-	param->erase_fn = nandmtd_erase_block;
-	param->initialise_flash_fn = nandmtd_initialise;
+
+	param->start_block = 0;
+	param->end_block = n_blocks - 1;
+
+	yaffs_mtd_drv_install(dev);
 
 	yaffs_dev_to_lc(dev)->put_super_fn = yaffs_mtd_put_super;