33 files changed, 98 insertions, 93 deletions

diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index 92de7e3a49a5..e2875d6fe129 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -82,7 +82,7 @@ static void amd76xrom_cleanup(struct amd76xrom_window *window)
                 if (map->rsrc.parent) {
                         release_resource(&map->rsrc);
                 }
-                del_mtd_device(map->mtd);
+                mtd_device_unregister(map->mtd);
                 map_destroy(map->mtd);
                 list_del(&map->list);
                 kfree(map);
@@ -262,7 +262,7 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
 
                 /* Now that the mtd devices is complete claim and export it */
                 map->mtd->owner = THIS_MODULE;
-                if (add_mtd_device(map->mtd)) {
+                if (mtd_device_register(map->mtd, NULL, 0)) {
                         map_destroy(map->mtd);
                         map->mtd = NULL;
                         goto out;
diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index 53664188fc47..e5bfd0e093bb 100644
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -88,7 +88,7 @@ map:
         sram_mtd->owner = THIS_MODULE;
         sram_mtd->erasesize = 16;
 
-        if (add_mtd_device(sram_mtd)) {
+        if (mtd_device_register(sram_mtd, NULL, 0)) {
                 printk("NV-RAM device addition failed\n");
                 err = -ENOMEM;
                 goto out_probe;
@@ -111,7 +111,7 @@ out:
 static void __exit cleanup_autcpu12_maps(void)
 {
         if (sram_mtd) {
-                del_mtd_device(sram_mtd);
+                mtd_device_unregister(sram_mtd);
                 map_destroy(sram_mtd);
                 iounmap((void *)autcpu12_sram_map.virt);
         }
diff --git a/drivers/mtd/maps/bcm963xx-flash.c b/drivers/mtd/maps/bcm963xx-flash.c
index 1f3049590d9e..608967fe74c6 100644
--- a/drivers/mtd/maps/bcm963xx-flash.c
+++ b/drivers/mtd/maps/bcm963xx-flash.c
@@ -224,8 +224,8 @@ probe_ok:
                 goto err_probe;
         }
 
-        return add_mtd_partitions(bcm963xx_mtd_info, parsed_parts,
-                                                parsed_nr_parts);
+        return mtd_device_register(bcm963xx_mtd_info, parsed_parts,
+                                   parsed_nr_parts);
 
 err_probe:
         iounmap(bcm963xx_map.virt);
@@ -235,7 +235,7 @@ err_probe:
 static int bcm963xx_remove(struct platform_device *pdev)
 {
         if (bcm963xx_mtd_info) {
-                del_mtd_partitions(bcm963xx_mtd_info);
+                mtd_device_unregister(bcm963xx_mtd_info);
                 map_destroy(bcm963xx_mtd_info);
         }
 
diff --git a/drivers/mtd/maps/cdb89712.c b/drivers/mtd/maps/cdb89712.c
index 8d92d8db9a98..c29cbf87ea0c 100644
--- a/drivers/mtd/maps/cdb89712.c
+++ b/drivers/mtd/maps/cdb89712.c
@@ -75,7 +75,7 @@ static int __init init_cdb89712_flash (void)
 
         flash_mtd->owner = THIS_MODULE;
 
-        if (add_mtd_device(flash_mtd)) {
+        if (mtd_device_register(flash_mtd, NULL, 0)) {
                 printk("FLASH device addition failed\n");
                 err = -ENOMEM;
                 goto out_probe;
@@ -141,7 +141,7 @@ static int __init init_cdb89712_sram (void)
         sram_mtd->owner = THIS_MODULE;
         sram_mtd->erasesize = 16;
 
-        if (add_mtd_device(sram_mtd)) {
+        if (mtd_device_register(sram_mtd, NULL, 0)) {
                 printk("SRAM device addition failed\n");
                 err = -ENOMEM;
                 goto out_probe;
@@ -209,7 +209,7 @@ static int __init init_cdb89712_bootrom (void)
         bootrom_mtd->owner = THIS_MODULE;
         bootrom_mtd->erasesize = 0x10000;
 
-        if (add_mtd_device(bootrom_mtd)) {
+        if (mtd_device_register(bootrom_mtd, NULL, 0)) {
                 printk("BootROM device addition failed\n");
                 err = -ENOMEM;
                 goto out_probe;
@@ -249,21 +249,21 @@ static int __init init_cdb89712_maps(void)
 static void __exit cleanup_cdb89712_maps(void)
 {
         if (sram_mtd) {
-                del_mtd_device(sram_mtd);
+                mtd_device_unregister(sram_mtd);
                 map_destroy(sram_mtd);
                 iounmap((void *)cdb89712_sram_map.virt);
                 release_resource (&cdb89712_sram_resource);
         }
 
         if (flash_mtd) {
-                del_mtd_device(flash_mtd);
+                mtd_device_unregister(flash_mtd);
                 map_destroy(flash_mtd);
                 iounmap((void *)cdb89712_flash_map.virt);
                 release_resource (&cdb89712_flash_resource);
         }
 
         if (bootrom_mtd) {
-                del_mtd_device(bootrom_mtd);
+                mtd_device_unregister(bootrom_mtd);
                 map_destroy(bootrom_mtd);
                 iounmap((void *)cdb89712_bootrom_map.virt);
                 release_resource (&cdb89712_bootrom_resource);
diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c
index 23f551dc8ca8..06f9c9815720 100644
--- a/drivers/mtd/maps/ceiva.c
+++ b/drivers/mtd/maps/ceiva.c
@@ -224,7 +224,7 @@ static void __exit clps_destroy_mtd(struct clps_info *clps, struct mtd_info *mtd
 {
         int i;
 
-        del_mtd_partitions(mtd);
+        mtd_device_unregister(mtd);
 
         if (mtd != clps[0].mtd)
                 mtd_concat_destroy(mtd);
@@ -292,11 +292,11 @@ static void __init clps_locate_partitions(struct mtd_info *mtd)
         if (nr_parts == 0) {
                 printk(KERN_NOTICE "clps flash: no partition info "
                         "available, registering whole flash\n");
-                add_mtd_device(mtd);
+                mtd_device_register(mtd, NULL, 0);
         } else {
                 printk(KERN_NOTICE "clps flash: using %s partition "
                         "definition\n", part_type);
-                add_mtd_partitions(mtd, parsed_parts, nr_parts);
+                mtd_device_register(mtd, parsed_parts, nr_parts);
         }
 
         /* Always succeeds. */
diff --git a/drivers/mtd/maps/cfi_flagadm.c b/drivers/mtd/maps/cfi_flagadm.c
index f71343cd77cc..d16fc9d3b8cd 100644
--- a/drivers/mtd/maps/cfi_flagadm.c
+++ b/drivers/mtd/maps/cfi_flagadm.c
@@ -107,7 +107,7 @@ static int __init init_flagadm(void)
         mymtd = do_map_probe("cfi_probe", &flagadm_map);
         if (mymtd) {
                 mymtd->owner = THIS_MODULE;
-                add_mtd_partitions(mymtd, flagadm_parts, PARTITION_COUNT);
+                mtd_device_register(mymtd, flagadm_parts, PARTITION_COUNT);
                 printk(KERN_NOTICE "FlagaDM flash device initialized\n");
                 return 0;
         }
@@ -119,7 +119,7 @@ static int __init init_flagadm(void)
 static void __exit cleanup_flagadm(void)
 {
         if (mymtd) {
-                del_mtd_partitions(mymtd);
+                mtd_device_unregister(mymtd);
                 map_destroy(mymtd);
         }
         if (flagadm_map.virt) {
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index 5fdb7b26cea3..3d0e762fa5f2 100644
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -94,7 +94,7 @@ static void ck804xrom_cleanup(struct ck804xrom_window *window)
                 if (map->rsrc.parent)
                         release_resource(&map->rsrc);
 
-                del_mtd_device(map->mtd);
+                mtd_device_unregister(map->mtd);
                 map_destroy(map->mtd);
                 list_del(&map->list);
                 kfree(map);
@@ -291,7 +291,7 @@ static int __devinit ck804xrom_init_one (struct pci_dev *pdev,
 
                 /* Now that the mtd devices is complete claim and export it */
                 map->mtd->owner = THIS_MODULE;
-                if (add_mtd_device(map->mtd)) {
+                if (mtd_device_register(map->mtd, NULL, 0)) {
                         map_destroy(map->mtd);
                         map->mtd = NULL;
                         goto out;
diff --git a/drivers/mtd/maps/dbox2-flash.c b/drivers/mtd/maps/dbox2-flash.c
index cfacfa6f45dd..85bdece6ab3f 100644
--- a/drivers/mtd/maps/dbox2-flash.c
+++ b/drivers/mtd/maps/dbox2-flash.c
@@ -93,7 +93,7 @@ static int __init init_dbox2_flash(void)
                 mymtd->owner = THIS_MODULE;
 
                 /* Create MTD devices for each partition. */
-                add_mtd_partitions(mymtd, partition_info, NUM_PARTITIONS);
+                mtd_device_register(mymtd, partition_info, NUM_PARTITIONS);
 
                 return 0;
         }
@@ -105,7 +105,7 @@ static int __init init_dbox2_flash(void)
 static void __exit cleanup_dbox2_flash(void)
 {
         if (mymtd) {
-                del_mtd_partitions(mymtd);
+                mtd_device_unregister(mymtd);
                 map_destroy(mymtd);
         }
         if (dbox2_flash_map.virt) {
diff --git a/drivers/mtd/maps/dilnetpc.c b/drivers/mtd/maps/dilnetpc.c
index 0713e3a5a22c..3e393f0da823 100644
--- a/drivers/mtd/maps/dilnetpc.c
+++ b/drivers/mtd/maps/dilnetpc.c
@@ -450,7 +450,7 @@ static int __init init_dnpc(void)
         partition_info[2].mtdp = &lowlvl_parts[1];
         partition_info[3].mtdp = &lowlvl_parts[3];
 
-        add_mtd_partitions(mymtd, partition_info, NUM_PARTITIONS);
+        mtd_device_register(mymtd, partition_info, NUM_PARTITIONS);
 
         /*
         ** now create a virtual MTD device by concatenating the for partitions
@@ -463,7 +463,8 @@ static int __init init_dnpc(void)
                 ** we do not supply mtd pointers in higlvl_partition_info, so
                 ** add_mtd_partitions() will register the devices.
                 */
-                add_mtd_partitions(merged_mtd, higlvl_partition_info, NUM_HIGHLVL_PARTITIONS);
+                mtd_device_register(merged_mtd, higlvl_partition_info,
+                                    NUM_HIGHLVL_PARTITIONS);
         }
 
         return 0;
@@ -472,12 +473,12 @@ static int __init init_dnpc(void)
 static void __exit cleanup_dnpc(void)
 {
         if(merged_mtd) {
-                del_mtd_partitions(merged_mtd);
+                mtd_device_unregister(merged_mtd);
                 mtd_concat_destroy(merged_mtd);
         }
 
         if (mymtd) {
-                del_mtd_partitions(mymtd);
+                mtd_device_unregister(mymtd);
                 map_destroy(mymtd);
         }
         if (dnpc_map.virt) {
diff --git a/drivers/mtd/maps/dmv182.c b/drivers/mtd/maps/dmv182.c
index d171674eb2ed..6538ac675e00 100644
--- a/drivers/mtd/maps/dmv182.c
+++ b/drivers/mtd/maps/dmv182.c
@@ -120,7 +120,7 @@ static int __init init_svme182(void)
                    this_mtd->size >> 20, FLASH_BASE_ADDR);
 
         this_mtd->owner = THIS_MODULE;
-        add_mtd_partitions(this_mtd, partitions, num_parts);
+        mtd_device_register(this_mtd, partitions, num_parts);
 
         return 0;
 }
@@ -129,7 +129,7 @@ static void __exit cleanup_svme182(void)
 {
         if (this_mtd)
         {
-                del_mtd_partitions(this_mtd);
+                mtd_device_unregister(this_mtd);
                 map_destroy(this_mtd);
         }
 
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c
index 4feb7507ab7c..08322b1c3e81 100644
--- a/drivers/mtd/maps/esb2rom.c
+++ b/drivers/mtd/maps/esb2rom.c
@@ -128,7 +128,7 @@ static void esb2rom_cleanup(struct esb2rom_window *window)
         list_for_each_entry_safe(map, scratch, &window->maps, list) {
                 if (map->rsrc.parent)
                         release_resource(&map->rsrc);
-                del_mtd_device(map->mtd);
+                mtd_device_unregister(map->mtd);
                 map_destroy(map->mtd);
                 list_del(&map->list);
                 kfree(map);
@@ -352,7 +352,7 @@ static int __devinit esb2rom_init_one(struct pci_dev *pdev,
 
                 /* Now that the mtd devices is complete claim and export it */
                 map->mtd->owner = THIS_MODULE;
-                if (add_mtd_device(map->mtd)) {
+                if (mtd_device_register(map->mtd, NULL, 0)) {
                         map_destroy(map->mtd);
                         map->mtd = NULL;
                         goto out;
diff --git a/drivers/mtd/maps/fortunet.c b/drivers/mtd/maps/fortunet.c
index 1e43124d498b..956e2e4f30ea 100644
--- a/drivers/mtd/maps/fortunet.c
+++ b/drivers/mtd/maps/fortunet.c
@@ -243,8 +243,9 @@ static int __init init_fortunet(void)
                                         &map_regions[ix].map_info);
                         }
                         map_regions[ix].mymtd->owner = THIS_MODULE;
-                        add_mtd_partitions(map_regions[ix].mymtd,
-                                map_regions[ix].parts,map_regions_parts[ix]);
+                        mtd_device_register(map_regions[ix].mymtd,
+                                            map_regions[ix].parts,
+                                            map_regions_parts[ix]);
                 }
         }
         if(iy)
@@ -261,7 +262,7 @@ static void __exit cleanup_fortunet(void)
                 {
                         if( map_regions[ix].mymtd )
                         {
-                                del_mtd_partitions( map_regions[ix].mymtd );
+                                mtd_device_unregister(map_regions[ix].mymtd);
                                 map_destroy( map_regions[ix].mymtd );
                         }
                         iounmap((void *)map_regions[ix].map_info.virt);
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c
index 1337a4191a0c..6689dcb3124d 100644
--- a/drivers/mtd/maps/ichxrom.c
+++ b/drivers/mtd/maps/ichxrom.c
@@ -67,7 +67,7 @@ static void ichxrom_cleanup(struct ichxrom_window *window)
         list_for_each_entry_safe(map, scratch, &window->maps, list) {
                 if (map->rsrc.parent)
                         release_resource(&map->rsrc);
-                del_mtd_device(map->mtd);
+                mtd_device_unregister(map->mtd);
                 map_destroy(map->mtd);
                 list_del(&map->list);
                 kfree(map);
@@ -287,7 +287,7 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
 
                 /* Now that the mtd devices is complete claim and export it */
                 map->mtd->owner = THIS_MODULE;
-                if (add_mtd_device(map->mtd)) {
+                if (mtd_device_register(map->mtd, NULL, 0)) {
                         map_destroy(map->mtd);
                         map->mtd = NULL;
                         goto out;
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c
index e22ff5adbbf4..a97bbcf0d584 100644
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@ -221,7 +221,7 @@ static int armflash_probe(struct platform_device *dev)
 
         err = parse_mtd_partitions(info->mtd, probes, &info->parts, 0);
         if (err > 0) {
-                err = add_mtd_partitions(info->mtd, info->parts, err);
+                err = mtd_device_register(info->mtd, info->parts, err);
                 if (err)
                         printk(KERN_ERR
                                "mtd partition registration failed: %d\n", err);
@@ -237,7 +237,7 @@ static int armflash_probe(struct platform_device *dev)
          */
  cleanup:
         if (info->mtd) {
-                del_mtd_partitions(info->mtd);
+                mtd_device_unregister(info->mtd);
                 if (info->mtd != info->subdev[0].mtd)
                         mtd_concat_destroy(info->mtd);
         }
@@ -263,7 +263,7 @@ static int armflash_remove(struct platform_device *dev)
 
         if (info) {
                 if (info->mtd) {
-                        del_mtd_partitions(info->mtd);
+                        mtd_device_unregister(info->mtd);
                         if (info->mtd != info->subdev[0].mtd)
                                 mtd_concat_destroy(info->mtd);
                 }
diff --git a/drivers/mtd/maps/l440gx.c b/drivers/mtd/maps/l440gx.c
index 9e054503c4cf..dd0360ba2412 100644
--- a/drivers/mtd/maps/l440gx.c
+++ b/drivers/mtd/maps/l440gx.c
@@ -138,7 +138,7 @@ static int __init init_l440gx(void)
         if (mymtd) {
                 mymtd->owner = THIS_MODULE;
 
-                add_mtd_device(mymtd);
+                mtd_device_register(mymtd, NULL, 0);
                 return 0;
         }
 
@@ -148,7 +148,7 @@ static int __init init_l440gx(void)
 
 static void __exit cleanup_l440gx(void)
 {
-        del_mtd_device(mymtd);
+        mtd_device_unregister(mymtd);
         map_destroy(mymtd);
 
         iounmap(l440gx_map.virt);
diff --git a/drivers/mtd/maps/mbx860.c b/drivers/mtd/maps/mbx860.c
index 0eb5a7c85380..93fa56c33003 100644
--- a/drivers/mtd/maps/mbx860.c
+++ b/drivers/mtd/maps/mbx860.c
@@ -69,8 +69,8 @@ static int __init init_mbx(void)
         mymtd = do_map_probe("jedec_probe", &mbx_map);
         if (mymtd) {
                 mymtd->owner = THIS_MODULE;
-                add_mtd_device(mymtd);
-                add_mtd_partitions(mymtd, partition_info, NUM_PARTITIONS);
+                mtd_device_register(mymtd, NULL, 0);
+                mtd_device_register(mymtd, partition_info, NUM_PARTITIONS);
                 return 0;
         }
 
@@ -81,7 +81,7 @@ static int __init init_mbx(void)
 static void __exit cleanup_mbx(void)
 {
         if (mymtd) {
-                del_mtd_device(mymtd);
+                mtd_device_unregister(mymtd);
                 map_destroy(mymtd);
         }
         if (mbx_map.virt) {
diff --git a/drivers/mtd/maps/netsc520.c b/drivers/mtd/maps/netsc520.c
index c0cb319b2b70..81dc2598bc0a 100644
--- a/drivers/mtd/maps/netsc520.c
+++ b/drivers/mtd/maps/netsc520.c
@@ -116,14 +116,14 @@ static int __init init_netsc520(void)
         }
 
         mymtd->owner = THIS_MODULE;
-        add_mtd_partitions( mymtd, partition_info, NUM_PARTITIONS );
+        mtd_device_register(mymtd, partition_info, NUM_PARTITIONS);
         return 0;
 }
 
 static void __exit cleanup_netsc520(void)
 {
         if (mymtd) {
-                del_mtd_partitions(mymtd);
+                mtd_device_unregister(mymtd);
                 map_destroy(mymtd);
         }
         if (netsc520_map.virt) {
diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c
index a97133eb9d70..eadcfffc4f9c 100644
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
@@ -383,13 +383,13 @@ static int __init nettel_init(void)
                 /* No BIOS regions when AMD boot */
                 num_intel_partitions -= 2;
         }
-        rc = add_mtd_partitions(intel_mtd, nettel_intel_partitions,
-                num_intel_partitions);
+        rc = mtd_device_register(intel_mtd, nettel_intel_partitions,
+                                 num_intel_partitions);
 #endif
 
         if (amd_mtd) {
-                rc = add_mtd_partitions(amd_mtd, nettel_amd_partitions,
-                        num_amd_partitions);
+                rc = mtd_device_register(amd_mtd, nettel_amd_partitions,
+                                         num_amd_partitions);
         }
 
 #ifdef CONFIG_MTD_CFI_INTELEXT
@@ -419,7 +419,7 @@ static void __exit nettel_cleanup(void)
         unregister_reboot_notifier(&nettel_notifier_block);
 #endif
         if (amd_mtd) {
-                del_mtd_partitions(amd_mtd);
+                mtd_device_unregister(amd_mtd);
                 map_destroy(amd_mtd);
         }
         if (nettel_mmcrp) {
@@ -432,7 +432,7 @@ static void __exit nettel_cleanup(void)
         }
 #ifdef CONFIG_MTD_CFI_INTELEXT
         if (intel_mtd) {
-                del_mtd_partitions(intel_mtd);
+                mtd_device_unregister(intel_mtd);
                 map_destroy(intel_mtd);
         }
         if (nettel_intel_map.virt) {
diff --git a/drivers/mtd/maps/octagon-5066.c b/drivers/mtd/maps/octagon-5066.c
index 23fe1786770f..807ac2a2e686 100644
--- a/drivers/mtd/maps/octagon-5066.c
+++ b/drivers/mtd/maps/octagon-5066.c
@@ -175,7 +175,7 @@ void cleanup_oct5066(void)
         int i;
         for (i=0; i<2; i++) {
                 if (oct5066_mtd[i]) {
-                        del_mtd_device(oct5066_mtd[i]);
+                        mtd_device_unregister(oct5066_mtd[i]);
                         map_destroy(oct5066_mtd[i]);
                 }
         }
@@ -220,7 +220,7 @@ static int __init init_oct5066(void)
                         oct5066_mtd[i] = do_map_probe("map_rom", &oct5066_map[i]);
                 if (oct5066_mtd[i]) {
                         oct5066_mtd[i]->owner = THIS_MODULE;
-                        add_mtd_device(oct5066_mtd[i]);
+                        mtd_device_register(oct5066_mtd[i], NULL, 0);
                 }
         }
 
diff --git a/drivers/mtd/maps/pci.c b/drivers/mtd/maps/pci.c
index 48f4cf5cb9d1..1d005a3e9b41 100644
--- a/drivers/mtd/maps/pci.c
+++ b/drivers/mtd/maps/pci.c
@@ -313,7 +313,7 @@ mtd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 goto release;
 
         mtd->owner = THIS_MODULE;
-        add_mtd_device(mtd);
+        mtd_device_register(mtd, NULL, 0);
 
         pci_set_drvdata(dev, mtd);
 
@@ -336,7 +336,7 @@ mtd_pci_remove(struct pci_dev *dev)
         struct mtd_info *mtd = pci_get_drvdata(dev);
         struct map_pci_info *map = mtd->priv;
 
-        del_mtd_device(mtd);
+        mtd_device_unregister(mtd);
         map_destroy(mtd);
         map->exit(dev, map);
         kfree(map);
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 6799e75d74e0..a523e2a6af53 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -630,7 +630,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
                 dev->pcmcia_map.copy_to = pcmcia_copy_to;
         }
 
-        if(add_mtd_device(mtd)) {
+        if (mtd_device_register(mtd, NULL, 0)) {
                 map_destroy(mtd);
                 dev->mtd_info = NULL;
                 dev_err(&dev->p_dev->dev,
@@ -669,7 +669,7 @@ static void pcmciamtd_detach(struct pcmcia_device *link)
         DEBUG(3, "link=0x%p", link);
 
         if(dev->mtd_info) {
-                del_mtd_device(dev->mtd_info);
+                mtd_device_unregister(dev->mtd_info);
                 dev_info(&dev->p_dev->dev, "mtd%d: Removing\n",
                          dev->mtd_info->index);
                 map_destroy(dev->mtd_info);
diff --git a/drivers/mtd/maps/pmcmsp-flash.c b/drivers/mtd/maps/pmcmsp-flash.c
index 64aea6acd48e..744ca5cacc9b 100644
--- a/drivers/mtd/maps/pmcmsp-flash.c
+++ b/drivers/mtd/maps/pmcmsp-flash.c
@@ -173,7 +173,7 @@ static int __init init_msp_flash(void)
                 msp_flash[i] = do_map_probe("cfi_probe", &msp_maps[i]);
                 if (msp_flash[i]) {
                         msp_flash[i]->owner = THIS_MODULE;
-                        add_mtd_partitions(msp_flash[i], msp_parts[i], pcnt);
+                        mtd_device_register(msp_flash[i], msp_parts[i], pcnt);
                 } else {
                         printk(KERN_ERR "map probe failed for flash\n");
                         ret = -ENXIO;
@@ -188,7 +188,7 @@ static int __init init_msp_flash(void)
 
 cleanup_loop:
         while (i--) {
-                del_mtd_partitions(msp_flash[i]);
+                mtd_device_unregister(msp_flash[i]);
                 map_destroy(msp_flash[i]);
                 kfree(msp_maps[i].name);
                 iounmap(msp_maps[i].virt);
@@ -207,7 +207,7 @@ static void __exit cleanup_msp_flash(void)
         int i;
 
         for (i = 0; i < fcnt; i++) {
-                del_mtd_partitions(msp_flash[i]);
+                mtd_device_unregister(msp_flash[i]);
                 map_destroy(msp_flash[i]);
                 iounmap((void *)msp_maps[i].virt);
 
diff --git a/drivers/mtd/maps/rpxlite.c b/drivers/mtd/maps/rpxlite.c
index 3e3ef53d4fd4..ed88225bf667 100644
--- a/drivers/mtd/maps/rpxlite.c
+++ b/drivers/mtd/maps/rpxlite.c
@@ -36,7 +36,7 @@ static int __init init_rpxlite(void)
         mymtd = do_map_probe("cfi_probe", &rpxlite_map);
         if (mymtd) {
                 mymtd->owner = THIS_MODULE;
-                add_mtd_device(mymtd);
+                mtd_device_register(mymtd, NULL, 0);
                 return 0;
         }
 
@@ -47,7 +47,7 @@ static int __init init_rpxlite(void)
 static void __exit cleanup_rpxlite(void)
 {
         if (mymtd) {
-                del_mtd_device(mymtd);
+                mtd_device_unregister(mymtd);
                 map_destroy(mymtd);
         }
         if (rpxlite_map.virt) {
diff --git a/drivers/mtd/maps/sbc_gxx.c b/drivers/mtd/maps/sbc_gxx.c
index 04b2781fc627..556a2dfe94c5 100644
--- a/drivers/mtd/maps/sbc_gxx.c
+++ b/drivers/mtd/maps/sbc_gxx.c
@@ -182,7 +182,7 @@ static struct mtd_info *all_mtd;
 static void cleanup_sbc_gxx(void)
 {
         if( all_mtd ) {
-                del_mtd_partitions( all_mtd );
+                mtd_device_unregister(all_mtd);
                 map_destroy( all_mtd );
         }
 
@@ -223,7 +223,7 @@ static int __init init_sbc_gxx(void)
         all_mtd->owner = THIS_MODULE;
 
         /* Create MTD devices for each partition. */
-        add_mtd_partitions(all_mtd, partition_info, NUM_PARTITIONS );
+        mtd_device_register(all_mtd, partition_info, NUM_PARTITIONS);
 
         return 0;
 }
diff --git a/drivers/mtd/maps/sc520cdp.c b/drivers/mtd/maps/sc520cdp.c
index 4d8aaaf4bb76..8fead8e46bce 100644
--- a/drivers/mtd/maps/sc520cdp.c
+++ b/drivers/mtd/maps/sc520cdp.c
@@ -266,10 +266,10 @@ static int __init init_sc520cdp(void)
                 /* Combine the two flash banks into a single MTD device & register it: */
                 merged_mtd = mtd_concat_create(mymtd, 2, "SC520CDP Flash Banks #0 and #1");
                 if(merged_mtd)
-                        add_mtd_device(merged_mtd);
+                        mtd_device_register(merged_mtd, NULL, 0);
         }
         if(devices_found == 3) /* register the third (DIL-Flash) device */
-                add_mtd_device(mymtd[2]);
+                mtd_device_register(mymtd[2], NULL, 0);
         return(devices_found ? 0 : -ENXIO);
 }
 
@@ -278,11 +278,11 @@ static void __exit cleanup_sc520cdp(void)
         int i;
 
         if (merged_mtd) {
-                del_mtd_device(merged_mtd);
+                mtd_device_unregister(merged_mtd);
                 mtd_concat_destroy(merged_mtd);
         }
         if (mymtd[2])
-                del_mtd_device(mymtd[2]);
+                mtd_device_unregister(mymtd[2]);
 
         for (i = 0; i < NUM_FLASH_BANKS; i++) {
                 if (mymtd[i])
diff --git a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c
index 7e329f09a548..d88c8426bb0f 100644
--- a/drivers/mtd/maps/scb2_flash.c
+++ b/drivers/mtd/maps/scb2_flash.c
@@ -180,7 +180,7 @@ scb2_flash_probe(struct pci_dev *dev, const struct pci_device_id *ent)
 
         scb2_mtd->owner = THIS_MODULE;
         if (scb2_fixup_mtd(scb2_mtd) < 0) {
-                del_mtd_device(scb2_mtd);
+                mtd_device_unregister(scb2_mtd);
                 map_destroy(scb2_mtd);
                 iounmap(scb2_ioaddr);
                 if (!region_fail)
@@ -192,7 +192,7 @@ scb2_flash_probe(struct pci_dev *dev, const struct pci_device_id *ent)
                (unsigned long long)scb2_mtd->size,
                (unsigned long long)(SCB2_WINDOW - scb2_mtd->size));
 
-        add_mtd_device(scb2_mtd);
+        mtd_device_register(scb2_mtd, NULL, 0);
 
         return 0;
 }
@@ -207,7 +207,7 @@ scb2_flash_remove(struct pci_dev *dev)
         if (scb2_mtd->lock)
                 scb2_mtd->lock(scb2_mtd, 0, scb2_mtd->size);
 
-        del_mtd_device(scb2_mtd);
+        mtd_device_unregister(scb2_mtd);
         map_destroy(scb2_mtd);
 
         iounmap(scb2_ioaddr);
diff --git a/drivers/mtd/maps/solutionengine.c b/drivers/mtd/maps/solutionengine.c
index 0eb41d9c6786..cbf6bade9354 100644
--- a/drivers/mtd/maps/solutionengine.c
+++ b/drivers/mtd/maps/solutionengine.c
@@ -89,7 +89,7 @@ static int __init init_soleng_maps(void)
         eprom_mtd = do_map_probe("map_rom", &soleng_eprom_map);
         if (eprom_mtd) {
                 eprom_mtd->owner = THIS_MODULE;
-                add_mtd_device(eprom_mtd);
+                mtd_device_register(eprom_mtd, NULL, 0);
         }
 
         nr_parts = parse_mtd_partitions(flash_mtd, probes, &parsed_parts, 0);
@@ -104,9 +104,9 @@ static int __init init_soleng_maps(void)
 #endif /* CONFIG_MTD_SUPERH_RESERVE */
 
         if (nr_parts > 0)
-                add_mtd_partitions(flash_mtd, parsed_parts, nr_parts);
+                mtd_device_register(flash_mtd, parsed_parts, nr_parts);
         else
-                add_mtd_device(flash_mtd);
+                mtd_device_register(flash_mtd, NULL, 0);
 
         return 0;
 }
@@ -114,14 +114,14 @@ static int __init init_soleng_maps(void)
 static void __exit cleanup_soleng_maps(void)
 {
         if (eprom_mtd) {
-                del_mtd_device(eprom_mtd);
+                mtd_device_unregister(eprom_mtd);
                 map_destroy(eprom_mtd);
         }
 
         if (parsed_parts)
-                del_mtd_partitions(flash_mtd);
+                mtd_device_unregister(flash_mtd);
         else
-                del_mtd_device(flash_mtd);
+                mtd_device_unregister(flash_mtd);
         map_destroy(flash_mtd);
 }
 
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index 3f1cb328a574..2d66234f57cb 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -101,7 +101,7 @@ int uflash_devinit(struct platform_device *op, struct device_node *dp)
 
         up->mtd->owner = THIS_MODULE;
 
-        add_mtd_device(up->mtd);
+        mtd_device_register(up->mtd, NULL, 0);
 
         dev_set_drvdata(&op->dev, up);
 
@@ -126,7 +126,7 @@ static int __devexit uflash_remove(struct platform_device *op)
         struct uflash_dev *up = dev_get_drvdata(&op->dev);
 
         if (up->mtd) {
-                del_mtd_device(up->mtd);
+                mtd_device_unregister(up->mtd);
                 map_destroy(up->mtd);
         }
         if (up->map.virt) {
diff --git a/drivers/mtd/maps/ts5500_flash.c b/drivers/mtd/maps/ts5500_flash.c
index e02dfa9d4ddd..d1d671daf235 100644
--- a/drivers/mtd/maps/ts5500_flash.c
+++ b/drivers/mtd/maps/ts5500_flash.c
@@ -89,7 +89,7 @@ static int __init init_ts5500_map(void)
         }
 
         mymtd->owner = THIS_MODULE;
-        add_mtd_partitions(mymtd, ts5500_partitions, NUM_PARTITIONS);
+        mtd_device_register(mymtd, ts5500_partitions, NUM_PARTITIONS);
 
         return 0;
 
@@ -102,7 +102,7 @@ err2:
 static void __exit cleanup_ts5500_map(void)
 {
         if (mymtd) {
-                del_mtd_partitions(mymtd);
+                mtd_device_unregister(mymtd);
                 map_destroy(mymtd);
         }
 
diff --git a/drivers/mtd/maps/tsunami_flash.c b/drivers/mtd/maps/tsunami_flash.c
index 77a8bfc02577..1de390e1c2fb 100644
--- a/drivers/mtd/maps/tsunami_flash.c
+++ b/drivers/mtd/maps/tsunami_flash.c
@@ -76,7 +76,7 @@ static void __exit  cleanup_tsunami_flash(void)
         struct mtd_info *mtd;
         mtd = tsunami_flash_mtd;
         if (mtd) {
-                del_mtd_device(mtd);
+                mtd_device_unregister(mtd);
                 map_destroy(mtd);
         }
         tsunami_flash_mtd = 0;
@@ -97,7 +97,7 @@ static int __init init_tsunami_flash(void)
         }
         if (tsunami_flash_mtd) {
                 tsunami_flash_mtd->owner = THIS_MODULE;
-                add_mtd_device(tsunami_flash_mtd);
+                mtd_device_register(tsunami_flash_mtd, NULL, 0);
                 return 0;
         }
         return -ENXIO;
diff --git a/drivers/mtd/maps/vmax301.c b/drivers/mtd/maps/vmax301.c
index 6adaa6acc193..5e68de73eabc 100644
--- a/drivers/mtd/maps/vmax301.c
+++ b/drivers/mtd/maps/vmax301.c
@@ -138,7 +138,7 @@ static void __exit cleanup_vmax301(void)
 
         for (i=0; i<2; i++) {
                 if (vmax_mtd[i]) {
-                        del_mtd_device(vmax_mtd[i]);
+                        mtd_device_unregister(vmax_mtd[i]);
                         map_destroy(vmax_mtd[i]);
                 }
         }
@@ -176,7 +176,7 @@ static int __init init_vmax301(void)
                         vmax_mtd[i] = do_map_probe("map_rom", &vmax_map[i]);
                 if (vmax_mtd[i]) {
                         vmax_mtd[i]->owner = THIS_MODULE;
-                        add_mtd_device(vmax_mtd[i]);
+                        mtd_device_register(vmax_mtd[i], NULL, 0);
                 }
         }
 
diff --git a/drivers/mtd/maps/vmu-flash.c b/drivers/mtd/maps/vmu-flash.c
index 4afc167731ef..3a04b078576a 100644
--- a/drivers/mtd/maps/vmu-flash.c
+++ b/drivers/mtd/maps/vmu-flash.c
@@ -563,7 +563,7 @@ static void vmu_queryblocks(struct mapleq *mq)
                 goto fail_cache_create;
         part_cur->pcache = pcache;
 
-        error = add_mtd_device(mtd_cur);
+        error = mtd_device_register(mtd_cur, NULL, 0);
         if (error)
                 goto fail_mtd_register;
 
@@ -709,7 +709,7 @@ static void __devexit vmu_disconnect(struct maple_device *mdev)
         for (x = 0; x < card->partitions; x++) {
                 mpart = ((card->mtd)[x]).priv;
                 mpart->mdev = NULL;
-                del_mtd_device(&((card->mtd)[x]));
+                mtd_device_unregister(&((card->mtd)[x]));
                 kfree(((card->parts)[x]).name);
         }
         kfree(card->parts);
diff --git a/drivers/mtd/maps/wr_sbc82xx_flash.c b/drivers/mtd/maps/wr_sbc82xx_flash.c
index 933a2b6598b4..901ce968efae 100644
--- a/drivers/mtd/maps/wr_sbc82xx_flash.c
+++ b/drivers/mtd/maps/wr_sbc82xx_flash.c
@@ -132,17 +132,20 @@ static int __init init_sbc82xx_flash(void)
                 nr_parts = parse_mtd_partitions(sbcmtd[i], part_probes,
                                                 &sbcmtd_parts[i], 0);
                 if (nr_parts > 0) {
-                        add_mtd_partitions (sbcmtd[i], sbcmtd_parts[i], nr_parts);
+                        mtd_device_register(sbcmtd[i], sbcmtd_parts[i],
+                                            nr_parts);
                         continue;
                 }
 
                 /* No partitioning detected. Use default */
                 if (i == 2) {
-                        add_mtd_device(sbcmtd[i]);
+                        mtd_device_register(sbcmtd[i], NULL, 0);
                 } else if (i == bigflash) {
-                        add_mtd_partitions (sbcmtd[i], bigflash_parts, ARRAY_SIZE(bigflash_parts));
+                        mtd_device_register(sbcmtd[i], bigflash_parts,
+                                            ARRAY_SIZE(bigflash_parts));
                 } else {
-                        add_mtd_partitions (sbcmtd[i], smallflash_parts, ARRAY_SIZE(smallflash_parts));
+                        mtd_device_register(sbcmtd[i], smallflash_parts,
+                                            ARRAY_SIZE(smallflash_parts));
                 }
         }
         return 0;
@@ -157,9 +160,9 @@ static void __exit cleanup_sbc82xx_flash(void)
                         continue;
 
                 if (i<2 || sbcmtd_parts[i])
-                        del_mtd_partitions(sbcmtd[i]);
+                        mtd_device_unregister(sbcmtd[i]);
                 else
-                        del_mtd_device(sbcmtd[i]);
+                        mtd_device_unregister(sbcmtd[i]);
 
                 kfree(sbcmtd_parts[i]);
                 map_destroy(sbcmtd[i]);