mtd/drivers/mtd/chips amd_flash.c, 1.24, 1.25 cfi_cmdset_0001.c, 1.153, 1.154 cfi_cmdset_0002.c, 1.104, 1.105 cfi_cmdset_0020.c, 1.14, 1.15 jedec.c, 1.20, 1.21 map_ram.c, 1.19, 1.20 sharp.c, 1.13, 1.14

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd/chips
In directory phoenix.infradead.org:/tmp/cvs-serv5601/drivers/mtd/chips

Modified Files:
	amd_flash.c cfi_cmdset_0001.c cfi_cmdset_0002.c 
	cfi_cmdset_0020.c jedec.c map_ram.c sharp.c 
Log Message:
Change alls driver to mtd_erase_callback, make partitions non-modular.

Index: amd_flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/amd_flash.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- amd_flash.c	12 Jul 2004 13:34:30 -0000	1.24
+++ amd_flash.c	9 Aug 2004 13:19:43 -0000	1.25
@@ -1307,9 +1307,7 @@
 	}
 		
 	instr->state = MTD_ERASE_DONE;
-	if (instr->callback) {
-		instr->callback(instr);
-	}
+	mtd_erase_callback(instr);
 	
 	return 0;
 }

Index: cfi_cmdset_0001.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0001.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- cfi_cmdset_0001.c	12 Jul 2004 21:52:20 -0000	1.153
+++ cfi_cmdset_0001.c	9 Aug 2004 13:19:43 -0000	1.154
@@ -1554,8 +1554,7 @@
 		return ret;
 
 	instr->state = MTD_ERASE_DONE;
-	if (instr->callback)
-		instr->callback(instr);
+	mtd_erase_callback(instr);
 	
 	return 0;
 }

Index: cfi_cmdset_0002.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0002.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- cfi_cmdset_0002.c	16 Jul 2004 17:42:35 -0000	1.104
+++ cfi_cmdset_0002.c	9 Aug 2004 13:19:43 -0000	1.105
@@ -1420,8 +1420,7 @@
 		return ret;
 
 	instr->state = MTD_ERASE_DONE;
-	if (instr->callback)
-		instr->callback(instr);
+	mtd_erase_callback(instr);
 	
 	return 0;
 }
@@ -1444,8 +1443,7 @@
 		return ret;
 
 	instr->state = MTD_ERASE_DONE;
-	if (instr->callback)
-		instr->callback(instr);
+	mtd_erase_callback(instr);
 	
 	return 0;
 }

Index: cfi_cmdset_0020.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0020.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cfi_cmdset_0020.c	20 Jul 2004 02:44:25 -0000	1.14
+++ cfi_cmdset_0020.c	9 Aug 2004 13:19:43 -0000	1.15
@@ -966,8 +966,7 @@
 	}
 		
 	instr->state = MTD_ERASE_DONE;
-	if (instr->callback)
-		instr->callback(instr);
+	mtd_erase_callback(instr);
 	
 	return 0;
 }

Index: jedec.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/jedec.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jedec.c	12 Jul 2004 14:03:01 -0000	1.20
+++ jedec.c	9 Aug 2004 13:19:43 -0000	1.21
@@ -780,8 +780,7 @@
        	    
    //printk("done\n");
    instr->state = MTD_ERASE_DONE;
-   if (instr->callback)
-	instr->callback(instr);
+   mtd_erase_callback(instr);
    return 0;
    
    #undef flread

Index: map_ram.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/map_ram.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- map_ram.c	12 Jul 2004 21:58:44 -0000	1.19
+++ map_ram.c	9 Aug 2004 13:19:43 -0000	1.20
@@ -114,8 +114,7 @@
 
 	instr->state = MTD_ERASE_DONE;
 
-	if (instr->callback)
-		instr->callback(instr);
+	mtd_erase_callback(instr);
 
 	return 0;
 }

Index: sharp.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/sharp.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sharp.c	12 Jul 2004 14:06:34 -0000	1.13
+++ sharp.c	9 Aug 2004 13:19:43 -0000	1.14
@@ -425,8 +425,7 @@
 	}
 
 	instr->state = MTD_ERASE_DONE;
-	if(instr->callback)
-		instr->callback(instr);
+	mtd_erase_callback(instr);
 
 	return 0;
 }