X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffs_flashif.c;h=f7c1998d996c3073ff0f709d77b9c25fdcc0f2be;hp=5740bbee1d62a581c7f177951a1194a6102bd9c7;hb=ce0a5fb9849b6dc0d1347709b28d3a34eefec662;hpb=976dbeae825b18e6759f3903073a6784248cc244

diff --git a/direct/yaffs_flashif.c b/direct/yaffs_flashif.c
index 5740bbe..f7c1998 100644
--- a/direct/yaffs_flashif.c
+++ b/direct/yaffs_flashif.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -19,7 +19,6 @@ const char *yaffs_flashif_c_version = "$Id: yaffs_flashif.c,v 1.3 2007-02-14 01:
 
 #include "yaffs_flashif.h"
 #include "yaffs_guts.h"
-#include "devextras.h"
 
 
 #define SIZE_IN_MB 16
@@ -68,7 +67,7 @@ static int  CheckInit(struct yaffs_dev *dev)
 	
 	ramdisk.nBlocks = (SIZE_IN_MB * 1024 * 1024)/(16 * 1024);
 	
-	ramdisk.block = YMALLOC(sizeof(yflash_Block *) * ramdisk.nBlocks);
+	ramdisk.block = kmalloc(sizeof(yflash_Block *) * ramdisk.nBlocks);
 	
 	if(!ramdisk.block) return 0;
 	
@@ -79,7 +78,7 @@ static int  CheckInit(struct yaffs_dev *dev)
 	
 	for(i=0; i <ramdisk.nBlocks && !fail; i++)
 	{
-		if((ramdisk.block[i] = YMALLOC(sizeof(yflash_Block))) == 0)
+		if((ramdisk.block[i] = kmalloc(sizeof(yflash_Block))) == 0)
 		{
 			fail = 1;
 		}
@@ -94,9 +93,9 @@ static int  CheckInit(struct yaffs_dev *dev)
 	{
 		for(i = 0; i < nAllocated; i++)
 		{
-			YFREE(ramdisk.block[i]);
+			kfree(ramdisk.block[i]);
 		}
-		YFREE(ramdisk.block);
+		kfree(ramdisk.block);
 		
 		T(YAFFS_TRACE_ALWAYS,("Allocation failed, could only allocate %dMB of %dMB requested.\n",
 		   nAllocated/64,ramdisk.nBlocks * YAFFS_BYTES_PER_BLOCK));
@@ -215,7 +214,7 @@ int yflash_MarkNANDBlockBad(struct yaffs_dev *dev, int block_no)
 	return YAFFS_OK;
 	
 }
-int yflash_QueryNANDBlock(struct yaffs_dev *dev, int block_no, yaffs_block_state_t *state, int *seq_number)
+int yflash_QueryNANDBlock(struct yaffs_dev *dev, int block_no, enum yaffs_block_state *state, int *seq_number)
 {
 	*state = YAFFS_BLOCK_STATE_EMPTY;
 	*seq_number = 0;