diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-05-29 12:16:48 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 08:02:00 -0400 |
commit | 2108c3bc632962422b7929e715ed6bbb837ac25c (patch) | |
tree | f9a079dd4c118c6866e9df1ac3431485f985b128 /drivers/mtd/nand/atmel_nand.c | |
parent | 2ef3855a91300bc0dae0ddc8689e4ee64abe6a8a (diff) |
mtd: atmel_nand don't specify default parsing options
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.
Artem: tweaked the patch
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd/nand/atmel_nand.c')
-rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 01fb5f0adcf0..47ece8e06e17 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c | |||
@@ -481,10 +481,6 @@ static void atmel_nand_hwctl(struct mtd_info *mtd, int mode) | |||
481 | } | 481 | } |
482 | } | 482 | } |
483 | 483 | ||
484 | #ifdef CONFIG_MTD_CMDLINE_PARTS | ||
485 | static const char *part_probes[] = { "cmdlinepart", NULL }; | ||
486 | #endif | ||
487 | |||
488 | /* | 484 | /* |
489 | * Probe for the NAND device. | 485 | * Probe for the NAND device. |
490 | */ | 486 | */ |
@@ -655,11 +651,8 @@ static int __init atmel_nand_probe(struct platform_device *pdev) | |||
655 | goto err_scan_tail; | 651 | goto err_scan_tail; |
656 | } | 652 | } |
657 | 653 | ||
658 | #ifdef CONFIG_MTD_CMDLINE_PARTS | ||
659 | mtd->name = "atmel_nand"; | 654 | mtd->name = "atmel_nand"; |
660 | num_partitions = parse_mtd_partitions(mtd, part_probes, | 655 | num_partitions = parse_mtd_partitions(mtd, NULL, &partitions, 0); |
661 | &partitions, 0); | ||
662 | #endif | ||
663 | if (num_partitions <= 0 && host->board->parts) { | 656 | if (num_partitions <= 0 && host->board->parts) { |
664 | partitions = host->board->parts; | 657 | partitions = host->board->parts; |
665 | num_partitions = host->board->num_parts; | 658 | num_partitions = host->board->num_parts; |