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

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

mtd: orion_nand.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 69c85f1f

drivers/mtd/nand/orion_nand.c

+2 −10
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ static int __init orion_nand_probe(struct platform_device *pdev) 
	struct resource *res;

	void __iomem *io_base;

	int ret = 0;

	struct mtd_partition *partitions = NULL;

	int num_part = 0;



	nc = kzalloc(sizeof(struct nand_chip) + sizeof(struct mtd_info), GFP_KERNEL);

	if (!nc) {
@@ -131,14 +129,8 @@ static int __init orion_nand_probe(struct platform_device *pdev) 
	}



	mtd->name = "orion_nand";

	num_part = parse_mtd_partitions(mtd, NULL, &partitions, 0);

	/* If cmdline partitions have been passed, let them be used */

	if (num_part <= 0) {

		num_part = board->nr_parts;

		partitions = board->parts;

	}



	ret = mtd_device_register(mtd, partitions, num_part);

	ret = mtd_device_parse_register(mtd, NULL, 0,

			board->parts, board->nr_parts);

	if (ret) {

		nand_release(mtd);

		goto no_dev;