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

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

mtd: onenand/samsung.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.

Axel Lin <axel.lin@gmail.com>: fixed build error.

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 7d010d2e

drivers/mtd/onenand/samsung.c

+3 −8
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ struct s3c_onenand { 
	struct resource *dma_res;

	unsigned long	phys_base;

	struct completion	complete;

	struct mtd_partition *parts;

};



#define CMD_MAP_00(dev, addr)		(dev->cmd_map(MAP_00, ((addr) << 1)))
@@ -1015,13 +1014,9 @@ static int s3c_onenand_probe(struct platform_device *pdev) 
	if (s3c_read_reg(MEM_CFG_OFFSET) & ONENAND_SYS_CFG1_SYNC_READ)

		dev_info(&onenand->pdev->dev, "OneNAND Sync. Burst Read enabled\n");



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

	if (err > 0)

		mtd_device_register(mtd, onenand->parts, err);

	else if (err <= 0 && pdata && pdata->parts)

		mtd_device_register(mtd, pdata->parts, pdata->nr_parts);

	else

		err = mtd_device_register(mtd, NULL, 0);

	err = mtd_device_parse_register(mtd, NULL, 0,

					pdata ? pdata->parts : NULL,

					pdata ? pdata->nr_parts : 0);



	platform_set_drvdata(pdev, mtd);