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>
This commit is contained in:
Родитель
2ef3855a91
Коммит
2108c3bc63
|
@ -481,10 +481,6 @@ static void atmel_nand_hwctl(struct mtd_info *mtd, int mode)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_MTD_CMDLINE_PARTS
|
|
||||||
static const char *part_probes[] = { "cmdlinepart", NULL };
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Probe for the NAND device.
|
* Probe for the NAND device.
|
||||||
*/
|
*/
|
||||||
|
@ -655,11 +651,8 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
|
||||||
goto err_scan_tail;
|
goto err_scan_tail;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_MTD_CMDLINE_PARTS
|
|
||||||
mtd->name = "atmel_nand";
|
mtd->name = "atmel_nand";
|
||||||
num_partitions = parse_mtd_partitions(mtd, part_probes,
|
num_partitions = parse_mtd_partitions(mtd, NULL, &partitions, 0);
|
||||||
&partitions, 0);
|
|
||||||
#endif
|
|
||||||
if (num_partitions <= 0 && host->board->parts) {
|
if (num_partitions <= 0 && host->board->parts) {
|
||||||
partitions = host->board->parts;
|
partitions = host->board->parts;
|
||||||
num_partitions = host->board->num_parts;
|
num_partitions = host->board->num_parts;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче