Commit 7029eef8 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Artem Bityutskiy
Browse files

mtd: solutionengine.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 769dc431

drivers/mtd/maps/solutionengine.c

+7 −23
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
static struct mtd_info *flash_mtd;

static struct mtd_info *eprom_mtd;



static struct mtd_partition *parsed_parts;



struct map_info soleng_eprom_map = {

	.name = "Solution Engine EPROM",

	.size = 0x400000,
@@ -51,12 +49,14 @@ static struct mtd_partition superh_se_partitions[] = { 
		.size = MTDPART_SIZ_FULL,

	}

};

#define NUM_PARTITIONS ARRAY_SIZE(superh_se_partitions)

#else

#define superh_se_partitions NULL

#define NUM_PARTITIONS 0

#endif /* CONFIG_MTD_SUPERH_RESERVE */



static int __init init_soleng_maps(void)

{

	int nr_parts = 0;



	/* First probe at offset 0 */

	soleng_flash_map.phys = 0;

	soleng_flash_map.virt = (void __iomem *)P2SEGADDR(0);
@@ -92,21 +92,8 @@ static int __init init_soleng_maps(void) 
		mtd_device_register(eprom_mtd, NULL, 0);

	}



	nr_parts = parse_mtd_partitions(flash_mtd, probes, &parsed_parts, 0);



#ifdef CONFIG_MTD_SUPERH_RESERVE

	if (nr_parts <= 0) {

		printk(KERN_NOTICE "Using configured partition at 0x%08x.\n",

		       CONFIG_MTD_SUPERH_RESERVE);

		parsed_parts = superh_se_partitions;

		nr_parts = sizeof(superh_se_partitions)/sizeof(*parsed_parts);

	}

#endif /* CONFIG_MTD_SUPERH_RESERVE */



	if (nr_parts > 0)

		mtd_device_register(flash_mtd, parsed_parts, nr_parts);

	else

		mtd_device_register(flash_mtd, NULL, 0);

	mtd_device_parse_register(flash_mtd, probes, 0,

			superh_se_partitions, NUM_PARTITIONS);



	return 0;

}
@@ -118,9 +105,6 @@ static void __exit cleanup_soleng_maps(void) 
		map_destroy(eprom_mtd);

	}



	if (parsed_parts)

		mtd_device_unregister(flash_mtd);

	else

	mtd_device_unregister(flash_mtd);

	map_destroy(flash_mtd);

}