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

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

mtd: ppchameleonevb.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 009c8407

drivers/mtd/nand/ppchameleonevb.c

+10 −32
Original line number Original line Diff line number Diff line
@@ -191,9 +191,6 @@ static int ppchameleonevb_device_ready(struct mtd_info *minfo) 
static int __init ppchameleonevb_init(void)

static int __init ppchameleonevb_init(void)

{

{

	struct nand_chip *this;

	struct nand_chip *this;

	const char *part_type = 0;

	int mtd_parts_nb = 0;

	struct mtd_partition *mtd_parts = 0;

	void __iomem *ppchameleon_fio_base;

	void __iomem *ppchameleon_fio_base;

	void __iomem *ppchameleonevb_fio_base;

	void __iomem *ppchameleonevb_fio_base;
@@ -276,24 +273,13 @@ static int __init ppchameleonevb_init(void) 
#endif

#endif





	ppchameleon_mtd->name = "ppchameleon-nand";

	ppchameleon_mtd->name = "ppchameleon-nand";

	mtd_parts_nb = parse_mtd_partitions(ppchameleon_mtd, NULL, &mtd_parts, 0);

	if (mtd_parts_nb > 0)

		part_type = "command line";

	else

		mtd_parts_nb = 0;



	if (mtd_parts_nb == 0) {

		if (ppchameleon_mtd->size == NAND_SMALL_SIZE)

			mtd_parts = partition_info_me;

		else

			mtd_parts = partition_info_hi;

		mtd_parts_nb = NUM_PARTITIONS;

		part_type = "static";

	}





	/* Register the partitions */

	/* Register the partitions */

	printk(KERN_NOTICE "Using %s partition definition\n", part_type);

	mtd_device_parse_register(ppchameleon_mtd, NULL, 0,

	mtd_device_register(ppchameleon_mtd, mtd_parts, mtd_parts_nb);

			ppchameleon_mtd->size == NAND_SMALL_SIZE ?

				partition_info_me :

				partition_info_hi,

			NUM_PARTITIONS);





 nand_evb_init:

 nand_evb_init:

	/****************************

	/****************************
@@ -377,21 +363,13 @@ static int __init ppchameleonevb_init(void) 
	}

	}





	ppchameleonevb_mtd->name = NAND_EVB_MTD_NAME;

	ppchameleonevb_mtd->name = NAND_EVB_MTD_NAME;

	mtd_parts_nb = parse_mtd_partitions(ppchameleonevb_mtd, NULL, &mtd_parts, 0);

	if (mtd_parts_nb > 0)

		part_type = "command line";

	else

		mtd_parts_nb = 0;



	if (mtd_parts_nb == 0) {

		mtd_parts = partition_info_evb;

		mtd_parts_nb = NUM_PARTITIONS;

		part_type = "static";

	}





	/* Register the partitions */

	/* Register the partitions */

	printk(KERN_NOTICE "Using %s partition definition\n", part_type);

	mtd_device_parse_register(ppchameleonevb_mtd, NULL, 0,

	mtd_device_register(ppchameleonevb_mtd, mtd_parts, mtd_parts_nb);

			ppchameleon_mtd->size == NAND_SMALL_SIZE ?

				partition_info_me :

				partition_info_hi,

			NUM_PARTITIONS);





	/* Return happy */

	/* Return happy */

	return 0;

	return 0;