]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mtd: orion_nand don't specify default parsing options
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Sun, 29 May 2011 16:17:04 +0000 (20:17 +0400)
committerArtem Bityutskiy <dedekind1@gmail.com>
Thu, 23 Jun 2011 08:43:39 +0000 (11:43 +0300)
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>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
drivers/mtd/nand/orion_nand.c

index 7794d0680f913b87932ba28d20729e642db382fb..5c55981df3da6b477b7dcd87a1facdae75757368 100644 (file)
@@ -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;