From 6b2ab68b15f5c7a533f1d8b7e1be3b22840df707 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Mon, 30 May 2011 01:02:23 +0400 Subject: [PATCH] --- yaml --- r: 274871 b: refs/heads/master c: a454a296aa8e63f5e5c749343a99fd25c37a3c44 h: refs/heads/master i: 274869: 9e0f3de3aa71ba71038bfcc88295e93a81e15a36 274867: cdf756c241b4b2d63d553a09cd19d7263929d29f 274863: f0c62a57ee34d3558456faf1758a2fefe9f8f95b v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/fsl_upm.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 40f3889450e2..11d5a48a559b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6b0fae717bd01d6fcdcef70989c4bc9b77ac0c0 +refs/heads/master: a454a296aa8e63f5e5c749343a99fd25c37a3c44 diff --git a/trunk/drivers/mtd/nand/fsl_upm.c b/trunk/drivers/mtd/nand/fsl_upm.c index 7c782ebd0f31..714d8318c6ad 100644 --- a/trunk/drivers/mtd/nand/fsl_upm.c +++ b/trunk/drivers/mtd/nand/fsl_upm.c @@ -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; @@ -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);