Skip to content

Commit

Permalink
mtd: orion_nand don't specify default parsing options
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Sep 11, 2011
1 parent f397d8c commit 4ac6b3e
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/mtd/nand/orion_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 4ac6b3e

Please sign in to comment.