Skip to contentSkip to conversation

(21/27) misc mtd sparse fixes

PATCH New Al Viro 1 participant 1 message Feb 2, 2005 Memory technology devices (MTD)

lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 1/1 (21/27) misc mtd sparse fixes

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

----

drivers/mtd/chips/jedec_probe.c +2 -2
diff -urN RC11-rc2-bk10-sent/drivers/mtd/chips/jedec_probe.c RC11-rc2-bk10-mtd-misc/drivers/mtd/chips/jedec_probe.c
@@ -1302,7 +1302,7 @@
  		.DevSize	= SIZE_256KiB,
  		.CmdSet		= P_ID_SST_PAGE,
  		.NumEraseRegions= 1,
- 		regions: {ERASEINFO(0x01000,64),
+ 		.regions = {ERASEINFO(0x01000,64),
  		}
          }, {
  		.mfr_id		= MANUFACTURER_SST,
@@ -1314,7 +1314,7 @@
  		.DevSize	= SIZE_256KiB,
  		.CmdSet		= P_ID_SST_PAGE,
  		.NumEraseRegions= 1,
- 		regions: {ERASEINFO(0x01000,64),
+ 		.regions = {ERASEINFO(0x01000,64),
  		}
 	}, {
 		.mfr_id		= MANUFACTURER_SST,
drivers/mtd/maps/sun_uflash.c +3 -3
diff -urN RC11-rc2-bk10-sent/drivers/mtd/maps/sun_uflash.c RC11-rc2-bk10-mtd-misc/drivers/mtd/maps/sun_uflash.c
@@ -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);