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

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

mtd: h720x-flash: 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 fdbf3bf6

drivers/mtd/maps/h720x-flash.c

+2 −4
Original line number Diff line number Diff line
@@ -92,18 +92,16 @@ static int __init h720x_mtd_init(void) 
	if (mymtd) {

		mymtd->owner = THIS_MODULE;



#ifdef CONFIG_MTD_PARTITIONS

		nr_mtd_parts = parse_mtd_partitions(mymtd, probes, &mtd_parts, 0);

		if (nr_mtd_parts > 0)

			part_type = "command line";

#endif

		if (nr_mtd_parts <= 0) {

			mtd_parts = h720x_partitions;

			nr_mtd_parts = NUM_PARTITIONS;

			part_type = "builtin";

		}

		printk(KERN_INFO "Using %s partition table\n", part_type);

		add_mtd_partitions(mymtd, mtd_parts, nr_mtd_parts);

		mtd_device_register(mymtd, mtd_parts, nr_mtd_parts);

		return 0;

	}
@@ -118,7 +116,7 @@ static void __exit h720x_mtd_cleanup(void) 
{



	if (mymtd) {

		del_mtd_partitions(mymtd);

		mtd_device_unregister(mymtd);

		map_destroy(mymtd);

	}