X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=yaffs_mtdif.c;h=b5fccec35f590bc2c903af63ef0662def6247e73;hb=6500cebaa2c93512d544719956af259ca13f83b7;hp=5de3193ea2b9bba34e104760a4ec23027d3487bf;hpb=0333f489a25b05a4c0176258204eee1db9e8c9e0;p=yaffs2.git

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 5de3193..b5fccec 100644
--- a/yaffs_mtdif.c
+++ b/yaffs_mtdif.c
@@ -13,7 +13,6 @@
 
 #include "yportenv.h"
 
-
 #include "yaffs_mtdif.h"
 
 #include "linux/mtd/mtd.h"
@@ -23,19 +22,18 @@
 
 #include "yaffs_linux.h"
 
-int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
+int nandmtd_erase_block(struct yaffs_dev *dev, int block_no)
 {
-	struct mtd_info *mtd = yaffs_DeviceToContext(dev)->mtd;
-	__u32 addr =
-	    ((loff_t) blockNumber) * dev->param.totalBytesPerChunk
-		* dev->param.nChunksPerBlock;
+	struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+	u32 addr =
+	    ((loff_t) block_no) * dev->param.total_bytes_per_chunk *
+	    dev->param.chunks_per_block;
 	struct erase_info ei;
-	
 	int retval = 0;
 
 	ei.mtd = mtd;
 	ei.addr = addr;
-	ei.len = dev->param.totalBytesPerChunk * dev->param.nChunksPerBlock;
+	ei.len = dev->param.total_bytes_per_chunk * dev->param.chunks_per_block;
 	ei.time = 1000;
 	ei.retries = 2;
 	ei.callback = NULL;
@@ -45,12 +43,11 @@ int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
 
 	if (retval == 0)
 		return YAFFS_OK;
-	else
-		return YAFFS_FAIL;
+
+	return YAFFS_FAIL;
 }
 
-int nandmtd_InitialiseNAND(yaffs_Device *dev)
+int nandmtd_initialise(struct yaffs_dev *dev)
 {
 	return YAFFS_OK;
 }
-