1 files changed, 4 insertions, 24 deletions

diff --git a/drivers/mtd/maps/impa7.c b/drivers/mtd/maps/impa7.c
index 404a50cbafa0..f47aedb24366 100644
--- a/drivers/mtd/maps/impa7.c
+++ b/drivers/mtd/maps/impa7.c
@@ -49,7 +49,7 @@ static struct map_info impa7_map[NUM_FLASHBANKS] = {
 /*
  * MTD partitioning stuff
  */
-static struct mtd_partition static_partitions[] =
+static struct mtd_partition partitions[] =
 {
         {
                 .name = "FileSystem",
@@ -58,16 +58,10 @@ static struct mtd_partition static_partitions[] =
         },
 };
 
-static int mtd_parts_nb[NUM_FLASHBANKS];
-static struct mtd_partition *mtd_parts[NUM_FLASHBANKS];
-
-static const char *probes[] = { "cmdlinepart", NULL };
-
 static int __init init_impa7(void)
 {
         static const char *rom_probe_types[] = PROBETYPES;
         const char **type;
-        const char *part_type = 0;
         int i;
         static struct { u_long addr; u_long size; } pt[NUM_FLASHBANKS] = {
           { WINDOW_ADDR0, WINDOW_SIZE0 },
@@ -97,23 +91,9 @@ static int __init init_impa7(void)
                 if (impa7_mtd[i]) {
                         impa7_mtd[i]->owner = THIS_MODULE;
                         devicesfound++;
-                        mtd_parts_nb[i] = parse_mtd_partitions(impa7_mtd[i],
-                                                               probes,
-                                                               &mtd_parts[i],
-                                                               0);
-                        if (mtd_parts_nb[i] > 0) {
-                                part_type = "command line";
-                        } else {
-                                mtd_parts[i] = static_partitions;
-                                mtd_parts_nb[i] = ARRAY_SIZE(static_partitions);
-                                part_type = "static";
-                        }
-
-                        printk(KERN_NOTICE MSG_PREFIX
-                               "using %s partition definition\n",
-                               part_type);
-                        mtd_device_register(impa7_mtd[i],
-                                            mtd_parts[i], mtd_parts_nb[i]);
+                        mtd_device_parse_register(impa7_mtd[i], NULL, 0,
+                                                  partitions,
+                                                  ARRAY_SIZE(partitions));
                 }
                 else
                         iounmap((void *)impa7_map[i].virt);