1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 23752fd5bc59..b4f3cc9f32fb 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -158,7 +158,7 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
 {
         int ret;
         struct device_node *flash_np;
-        static const char *part_types[] = { "cmdlinepart", NULL, };
+        struct mtd_part_parser_data ppdata;
 
         fun->chip.IO_ADDR_R = fun->io_base;
         fun->chip.IO_ADDR_W = fun->io_base;
@@ -192,18 +192,12 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
         if (ret)
                 goto err;
 
-        ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0);
-
-#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);
+        ppdata.of_node = flash_np;
+        ret = mtd_device_parse_register(&fun->mtd, NULL, &ppdata, NULL, 0);
 err:
         of_node_put(flash_np);
+        if (ret)
+                kfree(fun->mtd.name);
         return ret;
 }