|
@@ -112,7 +112,6 @@ struct omap_nand_info {
|
|
|
struct nand_hw_control controller;
|
|
|
struct omap_nand_platform_data *pdata;
|
|
|
struct mtd_info mtd;
|
|
|
- struct mtd_partition *parts;
|
|
|
struct nand_chip nand;
|
|
|
struct platform_device *pdev;
|
|
|
|
|
@@ -1101,13 +1100,8 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
|
|
|
goto out_release_mem_region;
|
|
|
}
|
|
|
|
|
|
- err = parse_mtd_partitions(&info->mtd, NULL, &info->parts, 0);
|
|
|
- if (err > 0)
|
|
|
- mtd_device_register(&info->mtd, info->parts, err);
|
|
|
- else if (pdata->parts)
|
|
|
- mtd_device_register(&info->mtd, pdata->parts, pdata->nr_parts);
|
|
|
- else
|
|
|
- mtd_device_register(&info->mtd, NULL, 0);
|
|
|
+ mtd_device_parse_register(&info->mtd, NULL, 0,
|
|
|
+ pdata->parts, pdata->nr_parts);
|
|
|
|
|
|
platform_set_drvdata(pdev, &info->mtd);
|
|
|
|