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

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

mtd: edb7312 nand: 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 0f47e952

drivers/mtd/nand/edb7312.c

+1 −8
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ static unsigned long ep7312_fio_pbase = EP7312_FIO_PBASE; 
static void __iomem *ep7312_pxdr = (void __iomem *)EP7312_PXDR;

static void __iomem *ep7312_pxddr = (void __iomem *)EP7312_PXDDR;



#ifdef CONFIG_MTD_PARTITIONS

/*

 * Define static partitions for flash device

 */
@@ -67,8 +66,6 @@ static struct mtd_partition partition_info[] = { 


#define NUM_PARTITIONS 1



#endif



/*

 *	hardware specific access to control-lines

 *
@@ -101,9 +98,7 @@ static int ep7312_device_ready(struct mtd_info *mtd) 
	return 1;

}



#ifdef CONFIG_MTD_PARTITIONS

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

#endif



/*

 * Main initialization routine
@@ -162,14 +157,12 @@ static int __init ep7312_init(void) 
		kfree(ep7312_mtd);

		return -ENXIO;

	}

#ifdef CONFIG_MTD_PARTITIONS

	ep7312_mtd->name = "edb7312-nand";

	mtd_parts_nb = parse_mtd_partitions(ep7312_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) {

		mtd_parts = partition_info;

		mtd_parts_nb = NUM_PARTITIONS;
@@ -178,7 +171,7 @@ static int __init ep7312_init(void) 


	/* Register the partitions */

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

	add_mtd_partitions(ep7312_mtd, mtd_parts, mtd_parts_nb);

	mtd_device_register(ep7312_mtd, mtd_parts, mtd_parts_nb);



	/* Return happy */

	return 0;