Skip to contentSkip to conversation

mtd: maps: remove check for CONFIG_MTD_SUPERH_RESERVE

PATCH In review Paul Bolle 2 participants 2 messages May 23, 2014 – May 28, 2014 Memory technology devices (MTD)

lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 1/1 mtd: maps: remove check for CONFIG_MTD_SUPERH_RESERVE

Since (a few releases before) v2.6.0 there have been checks for CONFIG_MTD_SUPERH_RESERVE. One check is still present. But a Kconfig symbol MTD_SUPERH_RESERVE has never been added. So a few lines of dead code can be removed.

Signed-off-by Paul Bolle <[email protected]>

---
Untested.

 drivers/mtd/maps/solutionengine.c | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)
drivers/mtd/maps/solutionengine.c +1 -24
index 83a7a7091562..bb580bc16445 100644
@@ -33,28 +33,6 @@ struct map_info soleng_flash_map = {
 
 static const char * const probes[] = { "RedBoot", "cmdlinepart", NULL };
 
-#ifdef CONFIG_MTD_SUPERH_RESERVE
-static struct mtd_partition superh_se_partitions[] = {
-	/* Reserved for boot code, read-only */
-	{
-		.name = "flash_boot",
-		.offset = 0x00000000,
-		.size = CONFIG_MTD_SUPERH_RESERVE,
-		.mask_flags = MTD_WRITEABLE,
-	},
-	/* All else is writable (e.g. JFFS) */
-	{
-		.name = "Flash FS",
-		.offset = MTDPART_OFS_NXTBLK,
-		.size = MTDPART_SIZ_FULL,
-	}
-};
-#define NUM_PARTITIONS ARRAY_SIZE(superh_se_partitions)
-#else
-#define superh_se_partitions NULL
-#define NUM_PARTITIONS 0
-#endif /* CONFIG_MTD_SUPERH_RESERVE */
-
 static int __init init_soleng_maps(void)
 {
 	/* First probe at offset 0 */

@@ -92,8 +70,7 @@ static int __init init_soleng_maps(void)
 		mtd_device_register(eprom_mtd, NULL, 0);
 	}
 
-	mtd_device_parse_register(flash_mtd, probes, NULL,
-				  superh_se_partitions, NUM_PARTITIONS);
+	mtd_device_parse_register(flash_mtd, probes, NULL, NULL, 0);
 
 	return 0;
 }
Signature · 1 line
1.9.0
#1 lore raw
Quoted 8 lines · Paul Bolle

Since (a few releases before) v2.6.0 there have been checks for CONFIG_MTD_SUPERH_RESERVE. One check is still present. But a Kconfig symbol MTD_SUPERH_RESERVE has never been added. So a few lines of dead code can be removed.

Signed-off-by Paul Bolle <[email protected]>

---
Untested.

Compile-tested and pushed to l2-mtd.git. Thanks!

Brian