mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 00:04:15 +08:00
mtd: h1910.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:
parent
0d04eda143
commit
4571c13962
@ -81,9 +81,6 @@ static int h1910_device_ready(struct mtd_info *mtd)
|
||||
static int __init h1910_init(void)
|
||||
{
|
||||
struct nand_chip *this;
|
||||
const char *part_type = 0;
|
||||
int mtd_parts_nb = 0;
|
||||
struct mtd_partition *mtd_parts = 0;
|
||||
void __iomem *nandaddr;
|
||||
|
||||
if (!machine_is_h1900())
|
||||
@ -136,18 +133,10 @@ static int __init h1910_init(void)
|
||||
iounmap((void *)nandaddr);
|
||||
return -ENXIO;
|
||||
}
|
||||
mtd_parts_nb = parse_mtd_partitions(h1910_nand_mtd, NULL, &mtd_parts, 0);
|
||||
if (mtd_parts_nb > 0)
|
||||
part_type = "command line";
|
||||
else {
|
||||
mtd_parts = partition_info;
|
||||
mtd_parts_nb = NUM_PARTITIONS;
|
||||
part_type = "static";
|
||||
}
|
||||
|
||||
/* Register the partitions */
|
||||
printk(KERN_NOTICE "Using %s partition definition\n", part_type);
|
||||
mtd_device_register(h1910_nand_mtd, mtd_parts, mtd_parts_nb);
|
||||
mtd_device_parse_register(h1910_nand_mtd, NULL, 0,
|
||||
partition_info, NUM_PARTITIONS);
|
||||
|
||||
/* Return happy */
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user