mtd: maps: remove check for CONFIG_MTD_SUPERH_RESERVE

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=390e9eacf1dcece3cee8fb4d95edbfea90574e91
Commit:     390e9eacf1dcece3cee8fb4d95edbfea90574e91
Parent:     0c53be9de8f25efadee707132a596276f0a015e4
Author:     Paul Bolle <pebolle at tiscali.nl>
AuthorDate: Fri May 23 16:29:54 2014 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Wed May 28 15:12:47 2014 -0700

    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 <pebolle at tiscali.nl>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/maps/solutionengine.c | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/drivers/mtd/maps/solutionengine.c b/drivers/mtd/maps/solutionengine.c
index 83a7a70..bb580bc 100644
--- a/drivers/mtd/maps/solutionengine.c
+++ b/drivers/mtd/maps/solutionengine.c
@@ -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;
 }