[PATCH 14/32] mtd: fsmc_nand don't specify default parsing options

Dmitry Eremin-Solenikov
2011-06-06T09:16:45Z

drivers/mtd/nand/fsmc_nand.c | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index e9b275a..80abbb2 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -177,9 +177,6 @@ static struct mtd_partition partition_info_128KB_blk[] = {
},
};

-#ifdef CONFIG_MTD_CMDLINE_PARTS
-const char *part_probes[] = { "cmdlinepart", NULL };
-#endif

/**
* struct fsmc_nand_data - structure for FSMC NAND device state
@@ -716,15 +713,13 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
* platform data,
* default partition information present in driver.
*/
-#ifdef CONFIG_MTD_CMDLINE_PARTS
/*
- * Check if partition info passed via command line
+ * Check for partition info passed
*/
host->mtd.name = "nand";
- host->nr_partitions = parse_mtd_partitions(&host->mtd, part_probes,
+ host->nr_partitions = parse_mtd_partitions(&host->mtd, NULL,
&host->partitions, 0);
if (host->nr_partitions <= 0) {
-#endif
/*
* Check if partition info passed via command line
*/
@@ -769,9 +764,7 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
}
}
}
-#ifdef CONFIG_MTD_CMDLINE_PARTS
}
-#endif

ret = mtd_device_register(&host->mtd, host->partitions,
host->nr_partitions);
--
1.7.4.4