Skip to content

Commit

Permalink
mtd: fsl_upm: use ofpart through generic parsing
Browse files Browse the repository at this point in the history 
Convert the driver to use ofpart partitions parsing through the generic
parse_mtd_partitions().

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <dedekind1@gmail.com>
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Sep 11, 2011
1 parent b6b0fae commit a454a29
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/mtd/nand/fsl_upm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
{
int ret;
struct device_node *flash_np;
struct mtd_part_parser_data ppdata;

fun->chip.IO_ADDR_R = fun->io_base;
fun->chip.IO_ADDR_W = fun->io_base;
Expand Down Expand Up @@ -191,15 +192,9 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
if (ret)
goto err;

ret = parse_mtd_partitions(&fun->mtd, NULL, &fun->parts, 0);
ppdata.of_node = flash_np;
ret = parse_mtd_partitions(&fun->mtd, NULL, &fun->parts, &ppdata);

#ifdef CONFIG_MTD_OF_PARTS
if (ret == 0) {
ret = of_mtd_parse_partitions(fun->dev, flash_np, &fun->parts);
if (ret < 0)
goto err;
}
#endif
ret = mtd_device_register(&fun->mtd, fun->parts, ret);
err:
of_node_put(flash_np);
Expand Down

0 comments on commit a454a29

Please sign in to comment.