Skip to content

Commit

Permalink
mtd: pxa3xx_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 16b206e commit c842f57
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions drivers/mtd/nand/pxa3xx_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
}
Expand Down

0 comments on commit c842f57

Please sign in to comment.