Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 49 insertions, 6 deletions

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 4147fe328c55..ba124baa646d 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -173,12 +173,53 @@ static struct mtd_info * __devinit obsolete_probe(struct of_device *dev,
         }
 }
 
+#ifdef CONFIG_MTD_PARTITIONS
+/* When partitions are set we look for a linux,part-probe property which
+   specifies the list of partition probers to use. If none is given then the
+   default is use. These take precedence over other device tree
+   information. */
+static const char *part_probe_types_def[] = { "cmdlinepart", "RedBoot", NULL };
+static const char ** __devinit of_get_probes(struct device_node *dp)
+{
+        const char *cp;
+        int cplen;
+        unsigned int l;
+        unsigned int count;
+        const char **res;
+
+        cp = of_get_property(dp, "linux,part-probe", &cplen);
+        if (cp == NULL)
+                return part_probe_types_def;
+
+        count = 0;
+        for (l = 0; l != cplen; l++)
+                if (cp[l] == 0)
+                        count++;
+
+        res = kzalloc((count + 1)*sizeof(*res), GFP_KERNEL);
+        count = 0;
+        while (cplen > 0) {
+                res[count] = cp;
+                l = strlen(cp) + 1;
+                cp += l;
+                cplen -= l;
+                count++;
+        }
+        return res;
+}
+
+static void __devinit of_free_probes(const char **probes)
+{
+        if (probes != part_probe_types_def)
+                kfree(probes);
+}
+#endif
+
 static int __devinit of_flash_probe(struct of_device *dev,
                                     const struct of_device_id *match)
 {
 #ifdef CONFIG_MTD_PARTITIONS
-        static const char *part_probe_types[]
-                = { "cmdlinepart", "RedBoot", NULL };
+        const char **part_probe_types;
 #endif
         struct device_node *dp = dev->dev.of_node;
         struct resource res;
@@ -218,7 +259,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
 
         dev_set_drvdata(&dev->dev, info);
 
-        mtd_list = kzalloc(sizeof(struct mtd_info) * count, GFP_KERNEL);
+        mtd_list = kzalloc(sizeof(*mtd_list) * count, GFP_KERNEL);
         if (!mtd_list)
                 goto err_flash_remove;
 
@@ -307,12 +348,14 @@ static int __devinit of_flash_probe(struct of_device *dev,
                 goto err_out;
 
 #ifdef CONFIG_MTD_PARTITIONS
-        /* First look for RedBoot table or partitions on the command
-         * line, these take precedence over device tree information */
+        part_probe_types = of_get_probes(dp);
         err = parse_mtd_partitions(info->cmtd, part_probe_types,
                                    &info->parts, 0);
-        if (err < 0)
+        if (err < 0) {
+                of_free_probes(part_probe_types);
                 return err;
+        }
+        of_free_probes(part_probe_types);
 
 #ifdef CONFIG_MTD_OF_PARTS
         if (err == 0) {