mtd: socrates_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:
Родитель
a4c93614fd
Коммит
7221eb1296
|
@ -155,8 +155,6 @@ static int socrates_nand_device_ready(struct mtd_info *mtd)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *part_probes[] = { "cmdlinepart", NULL };
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Probe for the NAND device.
|
* Probe for the NAND device.
|
||||||
*/
|
*/
|
||||||
|
@ -225,14 +223,11 @@ static int __devinit socrates_nand_probe(struct platform_device *ofdev)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_MTD_CMDLINE_PARTS
|
num_partitions = parse_mtd_partitions(mtd, NULL, &partitions, 0);
|
||||||
num_partitions = parse_mtd_partitions(mtd, part_probes,
|
|
||||||
&partitions, 0);
|
|
||||||
if (num_partitions < 0) {
|
if (num_partitions < 0) {
|
||||||
res = num_partitions;
|
res = num_partitions;
|
||||||
goto release;
|
goto release;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
if (num_partitions == 0) {
|
if (num_partitions == 0) {
|
||||||
num_partitions = of_mtd_parse_partitions(&ofdev->dev,
|
num_partitions = of_mtd_parse_partitions(&ofdev->dev,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче