1 files changed, 2 insertions, 22 deletions

diff --git a/drivers/mtd/maps/latch-addr-flash.c b/drivers/mtd/maps/latch-addr-flash.c
index 5936c466e901..119baa7d7477 100644
--- a/drivers/mtd/maps/latch-addr-flash.c
+++ b/drivers/mtd/maps/latch-addr-flash.c
@@ -33,9 +33,6 @@ struct latch_addr_flash_info {
         /* cache; could be found out of res */
         unsigned long           win_mask;
 
-        int                     nr_parts;
-        struct mtd_partition    *parts;
-
         spinlock_t              lock;
 };
 
@@ -97,8 +94,6 @@ static void lf_copy_from(struct map_info *map, void *to,
 
 static char *rom_probe_types[] = { "cfi_probe", NULL };
 
-static char *part_probe_types[] = { "cmdlinepart", NULL };
-
 static int latch_addr_flash_remove(struct platform_device *dev)
 {
         struct latch_addr_flash_info *info;
@@ -112,8 +107,6 @@ static int latch_addr_flash_remove(struct platform_device *dev)
         latch_addr_data = dev->dev.platform_data;
 
         if (info->mtd != NULL) {
-                if (info->nr_parts)
-                        kfree(info->parts);
                 mtd_device_unregister(info->mtd);
                 map_destroy(info->mtd);
         }
@@ -206,21 +199,8 @@ static int __devinit latch_addr_flash_probe(struct platform_device *dev)
         }
         info->mtd->owner = THIS_MODULE;
 
-        err = parse_mtd_partitions(info->mtd, (const char **)part_probe_types,
-                                   &info->parts, 0);
-        if (err > 0) {
-                mtd_device_register(info->mtd, info->parts, err);
-                return 0;
-        }
-        if (latch_addr_data->nr_parts) {
-                pr_notice("Using latch-addr-flash partition information\n");
-                mtd_device_register(info->mtd,
-                                    latch_addr_data->parts,
-                                    latch_addr_data->nr_parts);
-                return 0;
-        }
-
-        mtd_device_register(info->mtd, NULL, 0);
+        mtd_device_parse_register(info->mtd, NULL, 0,
+                        latch_addr_data->parts, latch_addr_data->nr_parts);
         return 0;
 
 iounmap: