diff mbox

[22/32] mtd: orion_nand don't specify default parsing options

Message ID 1307351782-7456-22-git-send-email-dbaryshkov@gmail.com
State Accepted
Commit 4ac6b3ef7191c508a356c205b02ab82f5e228d0c
Headers show

Commit Message

Dmitry Baryshkov June 6, 2011, 9:16 a.m. UTC 
Since 'cmdline, NULL' is now a default for parse_mtd_partitions, don't specify
this in every driver, instead pass NULL to force parse_mtd_partitions
to use default.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 drivers/mtd/nand/orion_nand.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 7794d06..5c55981 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -21,8 +21,6 @@ 
 #include <mach/hardware.h>
 #include <plat/orion_nand.h>
 
-static const char *part_probes[] = { "cmdlinepart", NULL };
-
 static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 {
 	struct nand_chip *nc = mtd->priv;
@@ -132,10 +130,8 @@  static int __init orion_nand_probe(struct platform_device *pdev)
 		goto no_dev;
 	}
 
-#ifdef CONFIG_MTD_CMDLINE_PARTS
 	mtd->name = "orion_nand";
-	num_part = parse_mtd_partitions(mtd, part_probes, &partitions, 0);
-#endif
+	num_part = parse_mtd_partitions(mtd, NULL, &partitions, 0);
 	/* If cmdline partitions have been passed, let them be used */
 	if (num_part <= 0) {
 		num_part = board->nr_parts;