mtd: h720x-flash.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: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
Родитель
534e4928ad
Коммит
8db2a08ee4
|
@ -58,16 +58,11 @@ static struct mtd_partition h720x_partitions[] = {
|
|||
|
||||
#define NUM_PARTITIONS ARRAY_SIZE(h720x_partitions)
|
||||
|
||||
static int nr_mtd_parts;
|
||||
static struct mtd_partition *mtd_parts;
|
||||
/*
|
||||
* Initialize FLASH support
|
||||
*/
|
||||
static int __init h720x_mtd_init(void)
|
||||
{
|
||||
|
||||
char *part_type = NULL;
|
||||
|
||||
h720x_map.virt = ioremap(h720x_map.phys, h720x_map.size);
|
||||
|
||||
if (!h720x_map.virt) {
|
||||
|
@ -90,16 +85,8 @@ static int __init h720x_mtd_init(void)
|
|||
if (mymtd) {
|
||||
mymtd->owner = THIS_MODULE;
|
||||
|
||||
nr_mtd_parts = parse_mtd_partitions(mymtd, NULL, &mtd_parts, 0);
|
||||
if (nr_mtd_parts > 0)
|
||||
part_type = "command line";
|
||||
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);
|
||||
mtd_device_register(mymtd, mtd_parts, nr_mtd_parts);
|
||||
mtd_device_parse_register(mymtd, NULL, 0,
|
||||
h720x_partitions, NUM_PARTITIONS);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -118,10 +105,6 @@ static void __exit h720x_mtd_cleanup(void)
|
|||
map_destroy(mymtd);
|
||||
}
|
||||
|
||||
/* Free partition info, if commandline partition was used */
|
||||
if (mtd_parts && (mtd_parts != h720x_partitions))
|
||||
kfree (mtd_parts);
|
||||
|
||||
if (h720x_map.virt) {
|
||||
iounmap((void *)h720x_map.virt);
|
||||
h720x_map.virt = 0;
|
||||
|
|
Загрузка…
Ссылка в новой задаче