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

Commit acd4134a authored by Jamie Iles's avatar Jamie Iles Committed by David Woodhouse
Browse files

mtd: ppchameleonevb: convert to mtd_device_register() 



Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 55c0689c

drivers/mtd/nand/ppchameleonevb.c

+5 −10
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ __setup("ppchameleon_fio_pbase=", ppchameleon_fio_pbase); 
__setup("ppchameleonevb_fio_pbase=", ppchameleonevb_fio_pbase);

#endif



#ifdef CONFIG_MTD_PARTITIONS

/*

 * Define static partitions for flash devices

 */
@@ -101,7 +100,6 @@ static struct mtd_partition partition_info_evb[] = { 
#define NUM_PARTITIONS 1



extern int parse_cmdline_partitions(struct mtd_info *master, struct mtd_partition **pparts, const char *mtd_id);

#endif



/*

 *	hardware specific access to control-lines
@@ -189,10 +187,8 @@ static int ppchameleonevb_device_ready(struct mtd_info *minfo) 
}

#endif



#ifdef CONFIG_MTD_PARTITIONS

const char *part_probes[] = { "cmdlinepart", NULL };

const char *part_probes_evb[] = { "cmdlinepart", NULL };

#endif



/*

 * Main initialization routine
@@ -284,14 +280,13 @@ static int __init ppchameleonevb_init(void) 
		this->chip_delay = NAND_SMALL_DELAY_US;

#endif



#ifdef CONFIG_MTD_PARTITIONS

	ppchameleon_mtd->name = "ppchameleon-nand";

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

	if (mtd_parts_nb > 0)

		part_type = "command line";

	else

		mtd_parts_nb = 0;

#endif



	if (mtd_parts_nb == 0) {

		if (ppchameleon_mtd->size == NAND_SMALL_SIZE)

			mtd_parts = partition_info_me;
@@ -303,7 +298,7 @@ static int __init ppchameleonevb_init(void) 


	/* Register the partitions */

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

	add_mtd_partitions(ppchameleon_mtd, mtd_parts, mtd_parts_nb);

	mtd_device_register(ppchameleon_mtd, mtd_parts, mtd_parts_nb);



 nand_evb_init:

	/****************************
@@ -385,14 +380,14 @@ static int __init ppchameleonevb_init(void) 
			iounmap(ppchameleon_fio_base);

		return -ENXIO;

	}

#ifdef CONFIG_MTD_PARTITIONS



	ppchameleonevb_mtd->name = NAND_EVB_MTD_NAME;

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

	if (mtd_parts_nb > 0)

		part_type = "command line";

	else

		mtd_parts_nb = 0;

#endif



	if (mtd_parts_nb == 0) {

		mtd_parts = partition_info_evb;

		mtd_parts_nb = NUM_PARTITIONS;
@@ -401,7 +396,7 @@ static int __init ppchameleonevb_init(void) 


	/* Register the partitions */

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

	add_mtd_partitions(ppchameleonevb_mtd, mtd_parts, mtd_parts_nb);

	mtd_device_register(ppchameleonevb_mtd, mtd_parts, mtd_parts_nb);



	/* Return happy */

	return 0;