Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69c85f1f authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Artem Bityutskiy
Browse files

mtd: omap2.c: use mtd_device_parse_register 



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: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent d4ed8f12

drivers/mtd/nand/omap2.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -112,7 +112,6 @@ struct omap_nand_info { 
	struct nand_hw_control		controller;

	struct nand_hw_control		controller;

	struct omap_nand_platform_data	*pdata;

	struct omap_nand_platform_data	*pdata;

	struct mtd_info			mtd;

	struct mtd_info			mtd;

	struct mtd_partition		*parts;

	struct nand_chip		nand;

	struct nand_chip		nand;

	struct platform_device		*pdev;

	struct platform_device		*pdev;
@@ -1101,13 +1100,8 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) 
		goto out_release_mem_region;

		goto out_release_mem_region;

	}

	}





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

	mtd_device_parse_register(&info->mtd, NULL, 0,

	if (err > 0)

			pdata->parts, pdata->nr_parts);

		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);





	platform_set_drvdata(pdev, &info->mtd);

	platform_set_drvdata(pdev, &info->mtd);