Skip to content

Commit

Permalink
mtd: davinci_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 5987d3f commit 4e243a0
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions drivers/mtd/nand/davinci_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -753,14 +753,7 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
if (ret < 0)
goto err_scan;

if (mtd_has_cmdlinepart()) {
static const char *probes[] __initconst = {
"cmdlinepart", NULL
};

mtd_parts_nb = parse_mtd_partitions(&info->mtd, probes,
&mtd_parts, 0);
}
mtd_parts_nb = parse_mtd_partitions(&info->mtd, NULL, &mtd_parts, 0);

if (mtd_parts_nb <= 0) {
mtd_parts = pdata->parts;
Expand Down

0 comments on commit 4e243a0

Please sign in to comment.