Skip to content

Commit

Permalink
mtd: pxa3xx_nand.c: use mtd_device_parse_register
Browse files Browse the repository at this point in the history
Replace custom invocations of parse_mtd_partitions and mtd_device_register
with common mtd_device_parse_register call. This would bring: standard
handling of all errors, fallback to default partitions, etc.

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 725b75a commit ee0f6a1
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions drivers/mtd/nand/pxa3xx_nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -1133,8 +1133,6 @@ 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 @@ -1152,13 +1150,8 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
return -ENODEV;
}


nr_parts = parse_mtd_partitions(info->mtd, NULL, &parts, 0);

if (nr_parts)
return mtd_device_register(info->mtd, parts, nr_parts);

return mtd_device_register(info->mtd, pdata->parts, pdata->nr_parts);
return mtd_device_parse_register(info->mtd, NULL, 0,
pdata->parts, pdata->nr_parts);
}

#ifdef CONFIG_PM
Expand Down

0 comments on commit ee0f6a1

Please sign in to comment.