MTD: small physmap_of partition parsing fixes

Use of_get_next_child for proper ref counting as suggested by Stephen Rothwell
and remove add_mtd_partitions from parse_partitions to avoid duplicate
mtd device registration for RedBoot partitions.

Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Heckled-for-on-IRC-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index aeed9ea79714ab56454840ee34d6eb5395e60f12..d4bcd3f8c57cf933f2c34bfac71f320c435a3688 100644 (file)
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -94,14 +94,13 @@ static int __devinit parse_partitions(struct of_flash *info,
         * line, these take precedence over device tree information */
        nr_parts = parse_mtd_partitions(info->mtd, part_probe_types,
                                        &info->parts, 0);
-       if (nr_parts > 0) {
-               add_mtd_partitions(info->mtd, info->parts, nr_parts);
-               return 0;
-       }
+       if (nr_parts > 0)
+               return nr_parts;
 
        /* First count the subnodes */
        nr_parts = 0;
-       for (pp = dp->child; pp; pp = pp->sibling)
+       for (pp = of_get_next_child(dp, NULL); pp;
+            pp = of_get_next_child(dp, pp))
                nr_parts++;
 
        if (nr_parts == 0)
@@ -112,12 +111,14 @@ static int __devinit parse_partitions(struct of_flash *info,
        if (!info->parts)
                return -ENOMEM;
 
-       for (pp = dp->child, i = 0; pp; pp = pp->sibling, i++) {
+       for (pp = of_get_next_child(dp, NULL), i = 0; pp;
+            pp = of_get_next_child(dp, pp), i++) {
                const u32 *reg;
                int len;
 
                reg = of_get_property(pp, "reg", &len);
                if (!reg || (len != 2*sizeof(u32))) {
+                       of_node_put(pp);
                        dev_err(&dev->dev, "Invalid 'reg' on %s\n",
                                dp->full_name);
                        kfree(info->parts);