Skip to content

Commit

Permalink
mtd: h1910.c: use mtd_device_parse_register
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Sep 11, 2011
1 parent 0d04eda commit 4571c13
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions drivers/mtd/nand/h1910.c
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 4571c13

Please sign in to comment.