mtd/drivers/mtd/chips cfi_cmdset_0001.c, 1.186, 1.187 cfi_cmdset_0002.c, 1.122, 1.123 cfi_cmdset_0020.c, 1.22, 1.23

[gleixner at infradead.org]

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

Modified Files:
	cfi_cmdset_0001.c cfi_cmdset_0002.c cfi_cmdset_0020.c 
Log Message:
Big mainline sync: Driver model updates, kfree fixup, version.h removals

Index: cfi_cmdset_0001.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0001.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- cfi_cmdset_0001.c	23 Nov 2005 22:07:52 -0000	1.186
+++ cfi_cmdset_0001.c	29 Nov 2005 20:01:26 -0000	1.187
@@ -484,8 +484,7 @@
 
  setup_err:
 	if(mtd) {
-		if(mtd->eraseregions)
-			kfree(mtd->eraseregions);
+		kfree(mtd->eraseregions);
 		kfree(mtd);
 	}
 	kfree(cfi->cmdset_priv);

Index: cfi_cmdset_0002.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0002.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- cfi_cmdset_0002.c	7 Nov 2005 11:14:22 -0000	1.122
+++ cfi_cmdset_0002.c	29 Nov 2005 20:01:26 -0000	1.123
@@ -388,8 +388,7 @@
 
  setup_err:
 	if(mtd) {
-		if(mtd->eraseregions)
-			kfree(mtd->eraseregions);
+		kfree(mtd->eraseregions);
 		kfree(mtd);
 	}
 	kfree(cfi->cmdset_priv);
@@ -1752,6 +1751,7 @@
 {
 	struct map_info *map = mtd->priv;
 	struct cfi_private *cfi = map->fldrv_priv;
+
 	kfree(cfi->cmdset_priv);
 	kfree(cfi->cfiq);
 	kfree(cfi);

Index: cfi_cmdset_0020.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0020.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cfi_cmdset_0020.c	7 Nov 2005 11:14:22 -0000	1.22
+++ cfi_cmdset_0020.c	29 Nov 2005 20:01:26 -0000	1.23
@@ -20,7 +20,6 @@
  * 	- Plugged memory leak in cfi_staa_writev().
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>