mtd: convert remaining users to mtd_device_register()

The older add_mtd_device()/add_mtd_partitions() and their removal
counterparts will soon be gone.  Replace uses with mtd_device_register()
and mtd_device_unregister().

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

10 files changed, 24 insertions, 24 deletions

diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 97183c8c9e33..b78f23169d4e 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -294,7 +294,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
         dev->mtd.priv = dev;
         dev->mtd.owner = THIS_MODULE;
 
-        if (add_mtd_device(&dev->mtd)) {
+        if (mtd_device_register(&dev->mtd, NULL, 0)) {
                 /* Device didn't get added, so free the entry */
                 goto devinit_err;
         }
@@ -465,7 +465,7 @@ static void __devexit block2mtd_exit(void)
         list_for_each_safe(pos, next, &blkmtd_device_list) {
                 struct block2mtd_dev *dev = list_entry(pos, typeof(*dev), list);
                 block2mtd_sync(&dev->mtd);
-                del_mtd_device(&dev->mtd);
+                mtd_device_unregister(&dev->mtd);
                 INFO("mtd%d: [%s] removed", dev->mtd.index,
                                 dev->mtd.name + strlen("block2mtd: "));
                 list_del(&dev->list);
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index 5bf5f460e132..f7fbf6025ef2 100644
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -597,7 +597,7 @@ void DoC2k_init(struct mtd_info *mtd)
                 doc2klist = mtd;
                 mtd->size = this->totlen;
                 mtd->erasesize = this->erasesize;
-                add_mtd_device(mtd);
+                mtd_device_register(mtd, NULL, 0);
                 return;
         }
 }
@@ -1185,7 +1185,7 @@ static void __exit cleanup_doc2000(void)
                 this = mtd->priv;
                 doc2klist = this->nextdoc;
 
-                del_mtd_device(mtd);
+                mtd_device_unregister(mtd);
 
                 iounmap(this->virtadr);
                 kfree(this->chips);
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
index 0990f7803628..241192f05bc8 100644
--- a/drivers/mtd/devices/doc2001.c
+++ b/drivers/mtd/devices/doc2001.c
@@ -376,7 +376,7 @@ void DoCMil_init(struct mtd_info *mtd)
                 this->nextdoc = docmillist;
                 docmillist = mtd;
                 mtd->size  = this->totlen;
-                add_mtd_device(mtd);
+                mtd_device_register(mtd, NULL, 0);
                 return;
         }
 }
@@ -826,7 +826,7 @@ static void __exit cleanup_doc2001(void)
                 this = mtd->priv;
                 docmillist = this->nextdoc;
 
-                del_mtd_device(mtd);
+                mtd_device_unregister(mtd);
 
                 iounmap(this->virtadr);
                 kfree(this->chips);
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c
index 8b36fa77a195..09ae0adc3ad0 100644
--- a/drivers/mtd/devices/doc2001plus.c
+++ b/drivers/mtd/devices/doc2001plus.c
@@ -499,7 +499,7 @@ void DoCMilPlus_init(struct mtd_info *mtd)
                 docmilpluslist = mtd;
                 mtd->size  = this->totlen;
                 mtd->erasesize = this->erasesize;
-                add_mtd_device(mtd);
+                mtd_device_register(mtd, NULL, 0);
                 return;
         }
 }
@@ -1091,7 +1091,7 @@ static void __exit cleanup_doc2001plus(void)
                 this = mtd->priv;
                 docmilpluslist = this->nextdoc;
 
-                del_mtd_device(mtd);
+                mtd_device_unregister(mtd);
 
                 iounmap(this->virtadr);
                 kfree(this->chips);
diff --git a/drivers/mtd/devices/lart.c b/drivers/mtd/devices/lart.c
index 4b829f97d56c..772a0ff89e0f 100644
--- a/drivers/mtd/devices/lart.c
+++ b/drivers/mtd/devices/lart.c
@@ -684,9 +684,10 @@ static int __init lart_flash_init (void)
 #endif
 
 #ifndef HAVE_PARTITIONS
-   result = add_mtd_device (&mtd);
+   result = mtd_device_register(&mtd, NULL, 0);
 #else
-   result = add_mtd_partitions (&mtd,lart_partitions, ARRAY_SIZE(lart_partitions));
+   result = mtd_device_register(&mtd, lart_partitions,
+                                ARRAY_SIZE(lart_partitions));
 #endif
 
    return (result);
@@ -695,9 +696,9 @@ static int __init lart_flash_init (void)
 static void __exit lart_flash_exit (void)
 {
 #ifndef HAVE_PARTITIONS
-   del_mtd_device (&mtd);
+   mtd_device_unregister(&mtd);
 #else
-   del_mtd_partitions (&mtd);
+   mtd_device_unregister(&mtd);
 #endif
 }
 
diff --git a/drivers/mtd/devices/ms02-nv.c b/drivers/mtd/devices/ms02-nv.c
index 6a9a24a80a6d..8423fb6d4f26 100644
--- a/drivers/mtd/devices/ms02-nv.c
+++ b/drivers/mtd/devices/ms02-nv.c
@@ -220,7 +220,7 @@ static int __init ms02nv_init_one(ulong addr)
         mtd->writesize = 1;
 
         ret = -EIO;
-        if (add_mtd_device(mtd)) {
+        if (mtd_device_register(mtd, NULL, 0)) {
                 printk(KERN_ERR
                         "ms02-nv: Unable to register MTD device, aborting!\n");
                 goto err_out_csr_res;
@@ -262,7 +262,7 @@ static void __exit ms02nv_remove_one(void)
 
         root_ms02nv_mtd = mp->next;
 
-        del_mtd_device(mtd);
+        mtd_device_unregister(mtd);
 
         release_resource(mp->resource.csr);
         kfree(mp->resource.csr);
diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c
index 1483e18971ce..2562689ba6b4 100644
--- a/drivers/mtd/devices/mtdram.c
+++ b/drivers/mtd/devices/mtdram.c
@@ -104,7 +104,7 @@ static int ram_write(struct mtd_info *mtd, loff_t to, size_t len,
 static void __exit cleanup_mtdram(void)
 {
         if (mtd_info) {
-                del_mtd_device(mtd_info);
+                mtd_device_unregister(mtd_info);
                 vfree(mtd_info->priv);
                 kfree(mtd_info);
         }
@@ -133,9 +133,8 @@ int mtdram_init_device(struct mtd_info *mtd, void *mapped_address,
         mtd->read = ram_read;
         mtd->write = ram_write;
 
-        if (add_mtd_device(mtd)) {
+        if (mtd_device_register(mtd, NULL, 0))
                 return -EIO;
-        }
 
         return 0;
 }
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index 8d28fa02a5a2..23423bd00b06 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -115,7 +115,7 @@ static void unregister_devices(void)
         struct phram_mtd_list *this, *safe;
 
         list_for_each_entry_safe(this, safe, &phram_list, list) {
-                del_mtd_device(&this->mtd);
+                mtd_device_unregister(&this->mtd);
                 iounmap(this->mtd.priv);
                 kfree(this->mtd.name);
                 kfree(this);
@@ -153,7 +153,7 @@ static int register_device(char *name, unsigned long start, unsigned long len)
         new->mtd.writesize = 1;
 
         ret = -EAGAIN;
-        if (add_mtd_device(&new->mtd)) {
+        if (mtd_device_register(&new->mtd, NULL, 0)) {
                 pr_err("Failed to register new device\n");
                 goto out2;
         }
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index 41b8cdcc64cb..ecff765579dd 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -798,7 +798,7 @@ static int __init init_pmc551(void)
                 mtd->writesize = 1;
                 mtd->owner = THIS_MODULE;
 
-                if (add_mtd_device(mtd)) {
+                if (mtd_device_register(mtd, NULL, 0)) {
                         printk(KERN_NOTICE "pmc551: Failed to register new device\n");
                         pci_iounmap(PCI_Device, priv->start);
                         kfree(mtd->priv);
@@ -806,7 +806,7 @@ static int __init init_pmc551(void)
                         break;
                 }
 
-                /* Keep a reference as the add_mtd_device worked */
+                /* Keep a reference as the mtd_device_register worked */
                 pci_dev_get(PCI_Device);
 
                 printk(KERN_NOTICE "Registered pmc551 memory device.\n");
@@ -856,7 +856,7 @@ static void __exit cleanup_pmc551(void)
                 pci_dev_put(priv->dev);
 
                 kfree(mtd->priv);
-                del_mtd_device(mtd);
+                mtd_device_unregister(mtd);
                 kfree(mtd);
                 found++;
         }
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index 592016a0668f..e585263161b9 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -210,7 +210,7 @@ static int register_device(char *name, unsigned long start, unsigned long length
         (*curmtd)->mtdinfo->erasesize = SLRAM_BLK_SZ;
         (*curmtd)->mtdinfo->writesize = 1;
 
-        if (add_mtd_device((*curmtd)->mtdinfo)) {
+        if (mtd_device_register((*curmtd)->mtdinfo, NULL, 0))   {
                 E("slram: Failed to register new device\n");
                 iounmap(((slram_priv_t *)(*curmtd)->mtdinfo->priv)->start);
                 kfree((*curmtd)->mtdinfo->priv);
@@ -231,7 +231,7 @@ static void unregister_devices(void)
 
         while (slram_mtdlist) {
                 nextitem = slram_mtdlist->next;
-                del_mtd_device(slram_mtdlist->mtdinfo);
+                mtd_device_unregister(slram_mtdlist->mtdinfo);
                 iounmap(((slram_priv_t *)slram_mtdlist->mtdinfo->priv)->start);
                 kfree(slram_mtdlist->mtdinfo->priv);
                 kfree(slram_mtdlist->mtdinfo);