mtd/drivers/mtd/maps sun_uflash.c,1.11,1.12

[gleixner at infradead.org]

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

Modified Files:
	sun_uflash.c 
Log Message:
Merge from mainstream.

[PATCH] misc mtd sparse fixes

 * jedec - switched to C99 initializers
 * sun_uflash - removed bogus cast to void * in argument of iounmap() +
   NULL noise removal.

Signed-off-by: Al Viro <viro at parcelfarce.linux.theplanet.co.uk>



Index: sun_uflash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sun_uflash.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sun_uflash.c	4 Nov 2004 13:24:15 -0000	1.11
+++ sun_uflash.c	17 Mar 2005 19:58:15 -0000	1.12
@@ -109,7 +109,7 @@
 	/* MTD registration */
 	pdev->mtd = do_map_probe("cfi_probe", &pdev->map);
 	if(0 == pdev->mtd) {
-		iounmap((void *)pdev->map.virt);
+		iounmap(pdev->map.virt);
 		kfree(pdev->name);
 		kfree(pdev);
 		return(-ENXIO);
@@ -163,8 +163,8 @@
 			map_destroy(udev->mtd);
 		}
 		if(0 != udev->map.virt) {
-			iounmap((void*)udev->map.virt);
-			udev->map.virt = 0;
+			iounmap(udev->map.virt);
+			udev->map.virt = NULL;
 		}
 		if(0 != udev->name) {
 			kfree(udev->name);