mtd: maps: remove check for CONFIG_MTD_SUPERH_RESERVE
authorPaul Bolle <pebolle@tiscali.nl>
Fri, 23 May 2014 14:29:54 +0000 (16:29 +0200)
committerBrian Norris <computersforpeace@gmail.com>
Wed, 28 May 2014 22:12:47 +0000 (15:12 -0700)
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@tiscali.nl>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/maps/solutionengine.c

index 83a7a70..bb580bc 100644 (file)
@@ -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;
 }