1 files changed, 1 insertions, 11 deletions

diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 073ee026a17c..23752fd5bc59 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -33,10 +33,7 @@ struct fsl_upm_nand {
         struct mtd_info mtd;
         struct nand_chip chip;
         int last_ctrl;
-#ifdef CONFIG_MTD_PARTITIONS
         struct mtd_partition *parts;
-#endif
-
         struct fsl_upm upm;
         uint8_t upm_addr_offset;
         uint8_t upm_cmd_offset;
@@ -161,9 +158,7 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
 {
         int ret;
         struct device_node *flash_np;
-#ifdef CONFIG_MTD_PARTITIONS
         static const char *part_types[] = { "cmdlinepart", NULL, };
-#endif
 
         fun->chip.IO_ADDR_R = fun->io_base;
         fun->chip.IO_ADDR_W = fun->io_base;
@@ -197,7 +192,6 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
         if (ret)
                 goto err;
 
-#ifdef CONFIG_MTD_PARTITIONS
         ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0);
 
 #ifdef CONFIG_MTD_OF_PARTS
@@ -207,11 +201,7 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
                         goto err;
         }
 #endif
-        if (ret > 0)
-                ret = add_mtd_partitions(&fun->mtd, fun->parts, ret);
-        else
-#endif
-                ret = add_mtd_device(&fun->mtd);
+        ret = mtd_device_register(&fun->mtd, fun->parts, ret);
 err:
         of_node_put(flash_np);
         return ret;