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

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

mtd: sa1100-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 16b0eb15

drivers/mtd/maps/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -347,7 +347,7 @@ config MTD_CDB89712 




config MTD_SA1100

config MTD_SA1100

	tristate "CFI Flash device mapped on StrongARM SA11x0"

	tristate "CFI Flash device mapped on StrongARM SA11x0"

	depends on MTD_CFI && ARCH_SA1100 && MTD_PARTITIONS

	depends on MTD_CFI && ARCH_SA1100

	help

	help

	  This enables access to the flash chips on most platforms based on

	  This enables access to the flash chips on most platforms based on

	  the SA1100 and SA1110, including the Assabet and the Compaq iPAQ.

	  the SA1100 and SA1110, including the Assabet and the Compaq iPAQ.

drivers/mtd/maps/sa1100-flash.c

+6 −15
Original line number Original line Diff line number Diff line
@@ -226,12 +226,7 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla 
	int i;

	int i;





	if (info->mtd) {

	if (info->mtd) {

		if (info->nr_parts == 0)

		mtd_device_unregister(info->mtd);

			del_mtd_device(info->mtd);

#ifdef CONFIG_MTD_PARTITIONS

		else

			del_mtd_partitions(info->mtd);

#endif

		if (info->mtd != info->subdev[0].mtd)

		if (info->mtd != info->subdev[0].mtd)

			mtd_concat_destroy(info->mtd);

			mtd_concat_destroy(info->mtd);

	}

	}
@@ -363,28 +358,24 @@ static int __devinit sa1100_mtd_probe(struct platform_device *pdev) 
	/*

	/*

	 * Partition selection stuff.

	 * Partition selection stuff.

	 */

	 */

#ifdef CONFIG_MTD_PARTITIONS

	nr_parts = parse_mtd_partitions(info->mtd, part_probes, &parts, 0);

	nr_parts = parse_mtd_partitions(info->mtd, part_probes, &parts, 0);

	if (nr_parts > 0) {

	if (nr_parts > 0) {

		info->parts = parts;

		info->parts = parts;

		part_type = "dynamic";

		part_type = "dynamic";

	} else

	} else {

#endif

	{

		parts = plat->parts;

		parts = plat->parts;

		nr_parts = plat->nr_parts;

		nr_parts = plat->nr_parts;

		part_type = "static";

		part_type = "static";

	}

	}





	if (nr_parts == 0) {

	if (nr_parts == 0)

		printk(KERN_NOTICE "SA1100 flash: no partition info "

		printk(KERN_NOTICE "SA1100 flash: no partition info "

			"available, registering whole flash\n");

			"available, registering whole flash\n");

		add_mtd_device(info->mtd);

	else

	} else {

		printk(KERN_NOTICE "SA1100 flash: using %s partition "

		printk(KERN_NOTICE "SA1100 flash: using %s partition "

			"definition\n", part_type);

			"definition\n", part_type);

		add_mtd_partitions(info->mtd, parts, nr_parts);



	}

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





	info->nr_parts = nr_parts;

	info->nr_parts = nr_parts;