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

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

mtd: fsl_upm: use ofpart through generic parsing 



Convert the driver to use ofpart partitions parsing through the generic
parse_mtd_partitions().

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <dedekind1@gmail.com>
parent b6b0fae7

drivers/mtd/nand/fsl_upm.c

+3 −8
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun, 
{

	int ret;

	struct device_node *flash_np;

	struct mtd_part_parser_data ppdata;



	fun->chip.IO_ADDR_R = fun->io_base;

	fun->chip.IO_ADDR_W = fun->io_base;
@@ -191,15 +192,9 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun, 
	if (ret)

		goto err;



	ret = parse_mtd_partitions(&fun->mtd, NULL, &fun->parts, 0);

	ppdata.of_node = flash_np;

	ret = parse_mtd_partitions(&fun->mtd, NULL, &fun->parts, &ppdata);



#ifdef CONFIG_MTD_OF_PARTS

	if (ret == 0) {

		ret = of_mtd_parse_partitions(fun->dev, flash_np, &fun->parts);

		if (ret < 0)

			goto err;

	}

#endif

	ret = mtd_device_register(&fun->mtd, fun->parts, ret);

err:

	of_node_put(flash_np);