leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: pxa3xx_nand don't specify default parsing options

Browse Source 
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>
This commit is contained in:
Dmitry Eremin-Solenikov 2011-05-29 20:17:06 +04:00 committed by Artem Bityutskiy
parent 16b206e62f
commit c842f570a6
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mtd/nand/pxa3xx_nand.c
View File

@ -1129,6 +1129,8 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
{
struct pxa3xx_nand_platform_data *pdata;
struct pxa3xx_nand_info *info;
struct mtd_partition *parts;
int nr_parts;
pdata = pdev->dev.platform_data;
if (!pdata) {
@ -1146,16 +1148,11 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
return -ENODEV;
}
if (mtd_has_cmdlinepart()) {
const char *probes[] = { "cmdlinepart", NULL };
struct mtd_partition *parts;
int nr_parts;
nr_parts = parse_mtd_partitions(info->mtd, probes, &parts, 0);
nr_parts = parse_mtd_partitions(info->mtd, NULL, &parts, 0);
if (nr_parts)
return mtd_device_register(info->mtd, parts, nr_parts);
}
if (nr_parts)
return mtd_device_register(info->mtd, parts, nr_parts);
return mtd_device_register(info->mtd, pdata->parts, pdata->nr_parts);
}