a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: convert remaining users to mtd_device_register()

Browse Source 
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>
This commit is contained in:
Jamie Iles 2011-05-23 10:23:40 +01:00 committed by David Woodhouse
parent 6b57c11601
commit ee0e87b174
60 changed files with 160 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/devices/block2mtd.c
View File

@ -294,7 +294,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
dev->mtd.priv = dev; dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE; 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 */ /* Device didn't get added, so free the entry */
goto devinit_err; goto devinit_err;
} }
@ -465,7 +465,7 @@ static void __devexit block2mtd_exit(void)
list_for_each_safe(pos, next, &blkmtd_device_list) { list_for_each_safe(pos, next, &blkmtd_device_list) {
struct block2mtd_dev *dev = list_entry(pos, typeof(*dev), list); struct block2mtd_dev *dev = list_entry(pos, typeof(*dev), list);
block2mtd_sync(&dev->mtd); block2mtd_sync(&dev->mtd);
del_mtd_device(&dev->mtd); mtd_device_unregister(&dev->mtd);
INFO("mtd%d: [%s] removed", dev->mtd.index, INFO("mtd%d: [%s] removed", dev->mtd.index,
dev->mtd.name + strlen("block2mtd: ")); dev->mtd.name + strlen("block2mtd: "));
list_del(&dev->list); list_del(&dev->list);

4
drivers/mtd/devices/doc2000.c
View File

@ -597,7 +597,7 @@ void DoC2k_init(struct mtd_info *mtd)
doc2klist = mtd; doc2klist = mtd;
mtd->size = this->totlen; mtd->size = this->totlen;
mtd->erasesize = this->erasesize; mtd->erasesize = this->erasesize;
add_mtd_device(mtd); mtd_device_register(mtd, NULL, 0);
return; return;
} }
} }
@ -1185,7 +1185,7 @@ static void __exit cleanup_doc2000(void)
this = mtd->priv; this = mtd->priv;
doc2klist = this->nextdoc; doc2klist = this->nextdoc;
del_mtd_device(mtd); mtd_device_unregister(mtd);
iounmap(this->virtadr); iounmap(this->virtadr);
kfree(this->chips); kfree(this->chips);

4
drivers/mtd/devices/doc2001.c
View File

@ -376,7 +376,7 @@ void DoCMil_init(struct mtd_info *mtd)
this->nextdoc = docmillist; this->nextdoc = docmillist;
docmillist = mtd; docmillist = mtd;
mtd->size = this->totlen; mtd->size = this->totlen;
add_mtd_device(mtd); mtd_device_register(mtd, NULL, 0);
return; return;
} }
} }
@ -826,7 +826,7 @@ static void __exit cleanup_doc2001(void)
this = mtd->priv; this = mtd->priv;
docmillist = this->nextdoc; docmillist = this->nextdoc;
del_mtd_device(mtd); mtd_device_unregister(mtd);
iounmap(this->virtadr); iounmap(this->virtadr);
kfree(this->chips); kfree(this->chips);

4
drivers/mtd/devices/doc2001plus.c
View File

@ -499,7 +499,7 @@ void DoCMilPlus_init(struct mtd_info *mtd)
docmilpluslist = mtd; docmilpluslist = mtd;
mtd->size = this->totlen; mtd->size = this->totlen;
mtd->erasesize = this->erasesize; mtd->erasesize = this->erasesize;
add_mtd_device(mtd); mtd_device_register(mtd, NULL, 0);
return; return;
} }
} }
@ -1091,7 +1091,7 @@ static void __exit cleanup_doc2001plus(void)
this = mtd->priv; this = mtd->priv;
docmilpluslist = this->nextdoc; docmilpluslist = this->nextdoc;
del_mtd_device(mtd); mtd_device_unregister(mtd);
iounmap(this->virtadr); iounmap(this->virtadr);
kfree(this->chips); kfree(this->chips);

9
drivers/mtd/devices/lart.c
View File

@ -684,9 +684,10 @@ static int __init lart_flash_init (void)
#endif #endif
#ifndef HAVE_PARTITIONS #ifndef HAVE_PARTITIONS
result = add_mtd_device (&mtd); result = mtd_device_register(&mtd, NULL, 0);
#else #else
result = add_mtd_partitions (&mtd,lart_partitions, ARRAY_SIZE(lart_partitions)); result = mtd_device_register(&mtd, lart_partitions,
ARRAY_SIZE(lart_partitions));
#endif #endif
return (result); return (result);
@ -695,9 +696,9 @@ static int __init lart_flash_init (void)
static void __exit lart_flash_exit (void) static void __exit lart_flash_exit (void)
{ {
#ifndef HAVE_PARTITIONS #ifndef HAVE_PARTITIONS
del_mtd_device (&mtd); mtd_device_unregister(&mtd);
#else #else
del_mtd_partitions (&mtd); mtd_device_unregister(&mtd);
#endif #endif
} }

4
drivers/mtd/devices/ms02-nv.c
View File

@ -220,7 +220,7 @@ static int __init ms02nv_init_one(ulong addr)
mtd->writesize = 1; mtd->writesize = 1;
ret = -EIO; ret = -EIO;
if (add_mtd_device(mtd)) { if (mtd_device_register(mtd, NULL, 0)) {
printk(KERN_ERR printk(KERN_ERR
"ms02-nv: Unable to register MTD device, aborting!\n"); "ms02-nv: Unable to register MTD device, aborting!\n");
goto err_out_csr_res; goto err_out_csr_res;
@ -262,7 +262,7 @@ static void __exit ms02nv_remove_one(void)
root_ms02nv_mtd = mp->next; root_ms02nv_mtd = mp->next;
del_mtd_device(mtd); mtd_device_unregister(mtd);
release_resource(mp->resource.csr); release_resource(mp->resource.csr);
kfree(mp->resource.csr); kfree(mp->resource.csr);

5
drivers/mtd/devices/mtdram.c
View File

@ -104,7 +104,7 @@ static int ram_write(struct mtd_info *mtd, loff_t to, size_t len,
static void __exit cleanup_mtdram(void) static void __exit cleanup_mtdram(void)
{ {
if (mtd_info) { if (mtd_info) {
del_mtd_device(mtd_info); mtd_device_unregister(mtd_info);
vfree(mtd_info->priv); vfree(mtd_info->priv);
kfree(mtd_info); kfree(mtd_info);
} }
@ -133,9 +133,8 @@ int mtdram_init_device(struct mtd_info *mtd, void *mapped_address,
mtd->read = ram_read; mtd->read = ram_read;
mtd->write = ram_write; mtd->write = ram_write;
if (add_mtd_device(mtd)) { if (mtd_device_register(mtd, NULL, 0))
return -EIO; return -EIO;
}
return 0; return 0;
} }

4
drivers/mtd/devices/phram.c
View File

@ -115,7 +115,7 @@ static void unregister_devices(void)
struct phram_mtd_list *this, *safe; struct phram_mtd_list *this, *safe;
list_for_each_entry_safe(this, safe, &phram_list, list) { list_for_each_entry_safe(this, safe, &phram_list, list) {
del_mtd_device(&this->mtd); mtd_device_unregister(&this->mtd);
iounmap(this->mtd.priv); iounmap(this->mtd.priv);
kfree(this->mtd.name); kfree(this->mtd.name);
kfree(this); kfree(this);
@ -153,7 +153,7 @@ static int register_device(char *name, unsigned long start, unsigned long len)
new->mtd.writesize = 1; new->mtd.writesize = 1;
ret = -EAGAIN; ret = -EAGAIN;
if (add_mtd_device(&new->mtd)) { if (mtd_device_register(&new->mtd, NULL, 0)) {
pr_err("Failed to register new device\n"); pr_err("Failed to register new device\n");
goto out2; goto out2;
} }

6
drivers/mtd/devices/pmc551.c
View File

@ -798,7 +798,7 @@ static int __init init_pmc551(void)
mtd->writesize = 1; mtd->writesize = 1;
mtd->owner = THIS_MODULE; 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"); printk(KERN_NOTICE "pmc551: Failed to register new device\n");
pci_iounmap(PCI_Device, priv->start); pci_iounmap(PCI_Device, priv->start);
kfree(mtd->priv); kfree(mtd->priv);
@ -806,7 +806,7 @@ static int __init init_pmc551(void)
break; break;
} }
/* Keep a reference as the add_mtd_device worked */ /* Keep a reference as the mtd_device_register worked */
pci_dev_get(PCI_Device); pci_dev_get(PCI_Device);
printk(KERN_NOTICE "Registered pmc551 memory device.\n"); printk(KERN_NOTICE "Registered pmc551 memory device.\n");
@ -856,7 +856,7 @@ static void __exit cleanup_pmc551(void)
pci_dev_put(priv->dev); pci_dev_put(priv->dev);
kfree(mtd->priv); kfree(mtd->priv);
del_mtd_device(mtd); mtd_device_unregister(mtd);
kfree(mtd); kfree(mtd);
found++; found++;
} }

4
drivers/mtd/devices/slram.c
View File

@ -210,7 +210,7 @@ static int register_device(char *name, unsigned long start, unsigned long length
(*curmtd)->mtdinfo->erasesize = SLRAM_BLK_SZ; (*curmtd)->mtdinfo->erasesize = SLRAM_BLK_SZ;
(*curmtd)->mtdinfo->writesize = 1; (*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"); E("slram: Failed to register new device\n");
iounmap(((slram_priv_t *)(*curmtd)->mtdinfo->priv)->start); iounmap(((slram_priv_t *)(*curmtd)->mtdinfo->priv)->start);
kfree((*curmtd)->mtdinfo->priv); kfree((*curmtd)->mtdinfo->priv);
@ -231,7 +231,7 @@ static void unregister_devices(void)
while (slram_mtdlist) { while (slram_mtdlist) {
nextitem = slram_mtdlist->next; 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); iounmap(((slram_priv_t *)slram_mtdlist->mtdinfo->priv)->start);
kfree(slram_mtdlist->mtdinfo->priv); kfree(slram_mtdlist->mtdinfo->priv);
kfree(slram_mtdlist->mtdinfo); kfree(slram_mtdlist->mtdinfo);

4
drivers/mtd/maps/amd76xrom.c
View File

@ -82,7 +82,7 @@ static void amd76xrom_cleanup(struct amd76xrom_window *window)
if (map->rsrc.parent) { if (map->rsrc.parent) {
release_resource(&map->rsrc); release_resource(&map->rsrc);
} }
del_mtd_device(map->mtd); mtd_device_unregister(map->mtd);
map_destroy(map->mtd); map_destroy(map->mtd);
list_del(&map->list); list_del(&map->list);
kfree(map); 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 */ /* Now that the mtd devices is complete claim and export it */
map->mtd->owner = THIS_MODULE; map->mtd->owner = THIS_MODULE;
if (add_mtd_device(map->mtd)) { if (mtd_device_register(map->mtd, NULL, 0)) {
map_destroy(map->mtd); map_destroy(map->mtd);
map->mtd = NULL; map->mtd = NULL;
goto out; goto out;

4
drivers/mtd/maps/autcpu12-nvram.c
View File

@ -88,7 +88,7 @@ map:
sram_mtd->owner = THIS_MODULE; sram_mtd->owner = THIS_MODULE;
sram_mtd->erasesize = 16; 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"); printk("NV-RAM device addition failed\n");
err = -ENOMEM; err = -ENOMEM;
goto out_probe; goto out_probe;
@ -111,7 +111,7 @@ out:
static void __exit cleanup_autcpu12_maps(void) static void __exit cleanup_autcpu12_maps(void)
{ {
if (sram_mtd) { if (sram_mtd) {
del_mtd_device(sram_mtd); mtd_device_unregister(sram_mtd);
map_destroy(sram_mtd); map_destroy(sram_mtd);
iounmap((void *)autcpu12_sram_map.virt); iounmap((void *)autcpu12_sram_map.virt);
} }

4
drivers/mtd/maps/bcm963xx-flash.c
View File

@ -224,7 +224,7 @@ probe_ok:
goto err_probe; goto err_probe;
} }
return add_mtd_partitions(bcm963xx_mtd_info, parsed_parts, return mtd_device_register(bcm963xx_mtd_info, parsed_parts,
parsed_nr_parts); parsed_nr_parts);
err_probe: err_probe:
@ -235,7 +235,7 @@ err_probe:
static int bcm963xx_remove(struct platform_device *pdev) static int bcm963xx_remove(struct platform_device *pdev)
{ {
if (bcm963xx_mtd_info) { if (bcm963xx_mtd_info) {
del_mtd_partitions(bcm963xx_mtd_info); mtd_device_unregister(bcm963xx_mtd_info);
map_destroy(bcm963xx_mtd_info); map_destroy(bcm963xx_mtd_info);
} }

12
drivers/mtd/maps/cdb89712.c
View File

@ -75,7 +75,7 @@ static int __init init_cdb89712_flash (void)
flash_mtd->owner = THIS_MODULE; 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"); printk("FLASH device addition failed\n");
err = -ENOMEM; err = -ENOMEM;
goto out_probe; goto out_probe;
@ -141,7 +141,7 @@ static int __init init_cdb89712_sram (void)
sram_mtd->owner = THIS_MODULE; sram_mtd->owner = THIS_MODULE;
sram_mtd->erasesize = 16; sram_mtd->erasesize = 16;
if (add_mtd_device(sram_mtd)) { if (mtd_device_register(sram_mtd, NULL, 0)) {
printk("SRAM device addition failed\n"); printk("SRAM device addition failed\n");
err = -ENOMEM; err = -ENOMEM;
goto out_probe; goto out_probe;
@ -209,7 +209,7 @@ static int __init init_cdb89712_bootrom (void)
bootrom_mtd->owner = THIS_MODULE; bootrom_mtd->owner = THIS_MODULE;
bootrom_mtd->erasesize = 0x10000; bootrom_mtd->erasesize = 0x10000;
if (add_mtd_device(bootrom_mtd)) { if (mtd_device_register(bootrom_mtd, NULL, 0)) {
printk("BootROM device addition failed\n"); printk("BootROM device addition failed\n");
err = -ENOMEM; err = -ENOMEM;
goto out_probe; goto out_probe;
@ -249,21 +249,21 @@ static int __init init_cdb89712_maps(void)
static void __exit cleanup_cdb89712_maps(void) static void __exit cleanup_cdb89712_maps(void)
{ {
if (sram_mtd) { if (sram_mtd) {
del_mtd_device(sram_mtd); mtd_device_unregister(sram_mtd);
map_destroy(sram_mtd); map_destroy(sram_mtd);
iounmap((void *)cdb89712_sram_map.virt); iounmap((void *)cdb89712_sram_map.virt);
release_resource (&cdb89712_sram_resource); release_resource (&cdb89712_sram_resource);
} }
if (flash_mtd) { if (flash_mtd) {
del_mtd_device(flash_mtd); mtd_device_unregister(flash_mtd);
map_destroy(flash_mtd); map_destroy(flash_mtd);
iounmap((void *)cdb89712_flash_map.virt); iounmap((void *)cdb89712_flash_map.virt);
release_resource (&cdb89712_flash_resource); release_resource (&cdb89712_flash_resource);
} }
if (bootrom_mtd) { if (bootrom_mtd) {
del_mtd_device(bootrom_mtd); mtd_device_unregister(bootrom_mtd);
map_destroy(bootrom_mtd); map_destroy(bootrom_mtd);
iounmap((void *)cdb89712_bootrom_map.virt); iounmap((void *)cdb89712_bootrom_map.virt);
release_resource (&cdb89712_bootrom_resource); release_resource (&cdb89712_bootrom_resource);

6
drivers/mtd/maps/ceiva.c
View File

@ -224,7 +224,7 @@ static void __exit clps_destroy_mtd(struct clps_info *clps, struct mtd_info *mtd
{ {
int i; int i;
del_mtd_partitions(mtd); mtd_device_unregister(mtd);
if (mtd != clps[0].mtd) if (mtd != clps[0].mtd)
mtd_concat_destroy(mtd); mtd_concat_destroy(mtd);
@ -292,11 +292,11 @@ static void __init clps_locate_partitions(struct mtd_info *mtd)
if (nr_parts == 0) { if (nr_parts == 0) {
printk(KERN_NOTICE "clps flash: no partition info " printk(KERN_NOTICE "clps flash: no partition info "
"available, registering whole flash\n"); "available, registering whole flash\n");
add_mtd_device(mtd); mtd_device_register(mtd, NULL, 0);
} else { } else {
printk(KERN_NOTICE "clps flash: using %s partition " printk(KERN_NOTICE "clps flash: using %s partition "
"definition\n", part_type); "definition\n", part_type);
add_mtd_partitions(mtd, parsed_parts, nr_parts); mtd_device_register(mtd, parsed_parts, nr_parts);
} }
/* Always succeeds. */ /* Always succeeds. */

4
drivers/mtd/maps/cfi_flagadm.c
View File

@ -107,7 +107,7 @@ static int __init init_flagadm(void)
mymtd = do_map_probe("cfi_probe", &flagadm_map); mymtd = do_map_probe("cfi_probe", &flagadm_map);
if (mymtd) { if (mymtd) {
mymtd->owner = THIS_MODULE; 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"); printk(KERN_NOTICE "FlagaDM flash device initialized\n");
return 0; return 0;
} }
@ -119,7 +119,7 @@ static int __init init_flagadm(void)
static void __exit cleanup_flagadm(void) static void __exit cleanup_flagadm(void)
{ {
if (mymtd) { if (mymtd) {
del_mtd_partitions(mymtd); mtd_device_unregister(mymtd);
map_destroy(mymtd); map_destroy(mymtd);
} }
if (flagadm_map.virt) { if (flagadm_map.virt) {

4
drivers/mtd/maps/ck804xrom.c
View File

@ -94,7 +94,7 @@ static void ck804xrom_cleanup(struct ck804xrom_window *window)
if (map->rsrc.parent) if (map->rsrc.parent)
release_resource(&map->rsrc); release_resource(&map->rsrc);
del_mtd_device(map->mtd); mtd_device_unregister(map->mtd);
map_destroy(map->mtd); map_destroy(map->mtd);
list_del(&map->list); list_del(&map->list);
kfree(map); 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 */ /* Now that the mtd devices is complete claim and export it */
map->mtd->owner = THIS_MODULE; map->mtd->owner = THIS_MODULE;
if (add_mtd_device(map->mtd)) { if (mtd_device_register(map->mtd, NULL, 0)) {
map_destroy(map->mtd); map_destroy(map->mtd);
map->mtd = NULL; map->mtd = NULL;
goto out; goto out;

4
drivers/mtd/maps/dbox2-flash.c
View File

@ -93,7 +93,7 @@ static int __init init_dbox2_flash(void)
mymtd->owner = THIS_MODULE; mymtd->owner = THIS_MODULE;
/* Create MTD devices for each partition. */ /* Create MTD devices for each partition. */
add_mtd_partitions(mymtd, partition_info, NUM_PARTITIONS); mtd_device_register(mymtd, partition_info, NUM_PARTITIONS);
return 0; return 0;
} }
@ -105,7 +105,7 @@ static int __init init_dbox2_flash(void)
static void __exit cleanup_dbox2_flash(void) static void __exit cleanup_dbox2_flash(void)
{ {
if (mymtd) { if (mymtd) {
del_mtd_partitions(mymtd); mtd_device_unregister(mymtd);
map_destroy(mymtd); map_destroy(mymtd);
} }
if (dbox2_flash_map.virt) { if (dbox2_flash_map.virt) {

9
drivers/mtd/maps/dilnetpc.c
View File

@ -450,7 +450,7 @@ static int __init init_dnpc(void)
partition_info[2].mtdp = &lowlvl_parts[1]; partition_info[2].mtdp = &lowlvl_parts[1];
partition_info[3].mtdp = &lowlvl_parts[3]; 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 ** 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 ** we do not supply mtd pointers in higlvl_partition_info, so
** add_mtd_partitions() will register the devices. ** 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; return 0;
@ -472,12 +473,12 @@ static int __init init_dnpc(void)
static void __exit cleanup_dnpc(void) static void __exit cleanup_dnpc(void)
{ {
if(merged_mtd) { if(merged_mtd) {
del_mtd_partitions(merged_mtd); mtd_device_unregister(merged_mtd);
mtd_concat_destroy(merged_mtd); mtd_concat_destroy(merged_mtd);
} }
if (mymtd) { if (mymtd) {
del_mtd_partitions(mymtd); mtd_device_unregister(mymtd);
map_destroy(mymtd); map_destroy(mymtd);
} }
if (dnpc_map.virt) { if (dnpc_map.virt) {

4
drivers/mtd/maps/dmv182.c
View File

@ -120,7 +120,7 @@ static int __init init_svme182(void)
this_mtd->size >> 20, FLASH_BASE_ADDR); this_mtd->size >> 20, FLASH_BASE_ADDR);
this_mtd->owner = THIS_MODULE; this_mtd->owner = THIS_MODULE;
add_mtd_partitions(this_mtd, partitions, num_parts); mtd_device_register(this_mtd, partitions, num_parts);
return 0; return 0;
} }
@ -129,7 +129,7 @@ static void __exit cleanup_svme182(void)
{ {
if (this_mtd) if (this_mtd)
{ {
del_mtd_partitions(this_mtd); mtd_device_unregister(this_mtd);
map_destroy(this_mtd); map_destroy(this_mtd);
} }

4
drivers/mtd/maps/esb2rom.c
View File

@ -128,7 +128,7 @@ static void esb2rom_cleanup(struct esb2rom_window *window)
list_for_each_entry_safe(map, scratch, &window->maps, list) { list_for_each_entry_safe(map, scratch, &window->maps, list) {
if (map->rsrc.parent) if (map->rsrc.parent)
release_resource(&map->rsrc); release_resource(&map->rsrc);
del_mtd_device(map->mtd); mtd_device_unregister(map->mtd);
map_destroy(map->mtd); map_destroy(map->mtd);
list_del(&map->list); list_del(&map->list);
kfree(map); 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 */ /* Now that the mtd devices is complete claim and export it */
map->mtd->owner = THIS_MODULE; map->mtd->owner = THIS_MODULE;
if (add_mtd_device(map->mtd)) { if (mtd_device_register(map->mtd, NULL, 0)) {
map_destroy(map->mtd); map_destroy(map->mtd);
map->mtd = NULL; map->mtd = NULL;
goto out; goto out;

7
drivers/mtd/maps/fortunet.c
View File

@ -243,8 +243,9 @@ static int __init init_fortunet(void)
&map_regions[ix].map_info); &map_regions[ix].map_info);
} }
map_regions[ix].mymtd->owner = THIS_MODULE; map_regions[ix].mymtd->owner = THIS_MODULE;
add_mtd_partitions(map_regions[ix].mymtd, mtd_device_register(map_regions[ix].mymtd,
map_regions[ix].parts,map_regions_parts[ix]); map_regions[ix].parts,
map_regions_parts[ix]);
} }
} }
if(iy) if(iy)
@ -261,7 +262,7 @@ static void __exit cleanup_fortunet(void)
{ {
if( map_regions[ix].mymtd ) 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 ); map_destroy( map_regions[ix].mymtd );
} }
iounmap((void *)map_regions[ix].map_info.virt); iounmap((void *)map_regions[ix].map_info.virt);

4
drivers/mtd/maps/ichxrom.c
View File

@ -67,7 +67,7 @@ static void ichxrom_cleanup(struct ichxrom_window *window)
list_for_each_entry_safe(map, scratch, &window->maps, list) { list_for_each_entry_safe(map, scratch, &window->maps, list) {
if (map->rsrc.parent) if (map->rsrc.parent)
release_resource(&map->rsrc); release_resource(&map->rsrc);
del_mtd_device(map->mtd); mtd_device_unregister(map->mtd);
map_destroy(map->mtd); map_destroy(map->mtd);
list_del(&map->list); list_del(&map->list);
kfree(map); 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 */ /* Now that the mtd devices is complete claim and export it */
map->mtd->owner = THIS_MODULE; map->mtd->owner = THIS_MODULE;
if (add_mtd_device(map->mtd)) { if (mtd_device_register(map->mtd, NULL, 0)) {
map_destroy(map->mtd); map_destroy(map->mtd);
map->mtd = NULL; map->mtd = NULL;
goto out; goto out;

6
drivers/mtd/maps/integrator-flash.c
View File

@ -221,7 +221,7 @@ static int armflash_probe(struct platform_device *dev)
err = parse_mtd_partitions(info->mtd, probes, &info->parts, 0); err = parse_mtd_partitions(info->mtd, probes, &info->parts, 0);
if (err > 0) { if (err > 0) {
err = add_mtd_partitions(info->mtd, info->parts, err); err = mtd_device_register(info->mtd, info->parts, err);
if (err) if (err)
printk(KERN_ERR printk(KERN_ERR
"mtd partition registration failed: %d\n", err); "mtd partition registration failed: %d\n", err);
@ -237,7 +237,7 @@ static int armflash_probe(struct platform_device *dev)
*/ */
cleanup: cleanup:
if (info->mtd) { if (info->mtd) {
del_mtd_partitions(info->mtd); mtd_device_unregister(info->mtd);
if (info->mtd != info->subdev[0].mtd) if (info->mtd != info->subdev[0].mtd)
mtd_concat_destroy(info->mtd); mtd_concat_destroy(info->mtd);
} }
@ -263,7 +263,7 @@ static int armflash_remove(struct platform_device *dev)
if (info) { if (info) {
if (info->mtd) { if (info->mtd) {
del_mtd_partitions(info->mtd); mtd_device_unregister(info->mtd);
if (info->mtd != info->subdev[0].mtd) if (info->mtd != info->subdev[0].mtd)
mtd_concat_destroy(info->mtd); mtd_concat_destroy(info->mtd);
} }

4
drivers/mtd/maps/l440gx.c
View File

@ -138,7 +138,7 @@ static int __init init_l440gx(void)
if (mymtd) { if (mymtd) {
mymtd->owner = THIS_MODULE; mymtd->owner = THIS_MODULE;
add_mtd_device(mymtd); mtd_device_register(mymtd, NULL, 0);
return 0; return 0;
} }
@ -148,7 +148,7 @@ static int __init init_l440gx(void)
static void __exit cleanup_l440gx(void) static void __exit cleanup_l440gx(void)
{ {
del_mtd_device(mymtd); mtd_device_unregister(mymtd);
map_destroy(mymtd); map_destroy(mymtd);
iounmap(l440gx_map.virt); iounmap(l440gx_map.virt);

6
drivers/mtd/maps/mbx860.c
View File

@ -69,8 +69,8 @@ static int __init init_mbx(void)
mymtd = do_map_probe("jedec_probe", &mbx_map); mymtd = do_map_probe("jedec_probe", &mbx_map);
if (mymtd) { if (mymtd) {
mymtd->owner = THIS_MODULE; mymtd->owner = THIS_MODULE;
add_mtd_device(mymtd); mtd_device_register(mymtd, NULL, 0);
add_mtd_partitions(mymtd, partition_info, NUM_PARTITIONS); mtd_device_register(mymtd, partition_info, NUM_PARTITIONS);
return 0; return 0;
} }
@ -81,7 +81,7 @@ static int __init init_mbx(void)
static void __exit cleanup_mbx(void) static void __exit cleanup_mbx(void)
{ {
if (mymtd) { if (mymtd) {
del_mtd_device(mymtd); mtd_device_unregister(mymtd);
map_destroy(mymtd); map_destroy(mymtd);
} }
if (mbx_map.virt) { if (mbx_map.virt) {

4
drivers/mtd/maps/netsc520.c
View File

@ -116,14 +116,14 @@ static int __init init_netsc520(void)
} }
mymtd->owner = THIS_MODULE; mymtd->owner = THIS_MODULE;
add_mtd_partitions( mymtd, partition_info, NUM_PARTITIONS ); mtd_device_register(mymtd, partition_info, NUM_PARTITIONS);
return 0; return 0;
} }
static void __exit cleanup_netsc520(void) static void __exit cleanup_netsc520(void)
{ {
if (mymtd) { if (mymtd) {
del_mtd_partitions(mymtd); mtd_device_unregister(mymtd);
map_destroy(mymtd); map_destroy(mymtd);
} }
if (netsc520_map.virt) { if (netsc520_map.virt) {

8
drivers/mtd/maps/nettel.c
View File

@ -383,12 +383,12 @@ static int __init nettel_init(void)
/* No BIOS regions when AMD boot */ /* No BIOS regions when AMD boot */
num_intel_partitions -= 2; num_intel_partitions -= 2;
} }
rc = add_mtd_partitions(intel_mtd, nettel_intel_partitions, rc = mtd_device_register(intel_mtd, nettel_intel_partitions,
num_intel_partitions); num_intel_partitions);
#endif #endif
if (amd_mtd) { if (amd_mtd) {
rc = add_mtd_partitions(amd_mtd, nettel_amd_partitions, rc = mtd_device_register(amd_mtd, nettel_amd_partitions,
num_amd_partitions); num_amd_partitions);
} }
@ -419,7 +419,7 @@ static void __exit nettel_cleanup(void)
unregister_reboot_notifier(&nettel_notifier_block); unregister_reboot_notifier(&nettel_notifier_block);
#endif #endif
if (amd_mtd) { if (amd_mtd) {
del_mtd_partitions(amd_mtd); mtd_device_unregister(amd_mtd);
map_destroy(amd_mtd); map_destroy(amd_mtd);
} }
if (nettel_mmcrp) { if (nettel_mmcrp) {
@ -432,7 +432,7 @@ static void __exit nettel_cleanup(void)
} }
#ifdef CONFIG_MTD_CFI_INTELEXT #ifdef CONFIG_MTD_CFI_INTELEXT
if (intel_mtd) { if (intel_mtd) {
del_mtd_partitions(intel_mtd); mtd_device_unregister(intel_mtd);
map_destroy(intel_mtd); map_destroy(intel_mtd);
} }
if (nettel_intel_map.virt) { if (nettel_intel_map.virt) {

4
drivers/mtd/maps/octagon-5066.c
View File

@ -175,7 +175,7 @@ void cleanup_oct5066(void)
int i; int i;
for (i=0; i<2; i++) { for (i=0; i<2; i++) {
if (oct5066_mtd[i]) { if (oct5066_mtd[i]) {
del_mtd_device(oct5066_mtd[i]); mtd_device_unregister(oct5066_mtd[i]);
map_destroy(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]); oct5066_mtd[i] = do_map_probe("map_rom", &oct5066_map[i]);
if (oct5066_mtd[i]) { if (oct5066_mtd[i]) {
oct5066_mtd[i]->owner = THIS_MODULE; oct5066_mtd[i]->owner = THIS_MODULE;
add_mtd_device(oct5066_mtd[i]); mtd_device_register(oct5066_mtd[i], NULL, 0);
} }
} }

4
drivers/mtd/maps/pci.c
View File

@ -313,7 +313,7 @@ mtd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
goto release; goto release;
mtd->owner = THIS_MODULE; mtd->owner = THIS_MODULE;
add_mtd_device(mtd); mtd_device_register(mtd, NULL, 0);
pci_set_drvdata(dev, mtd); 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 mtd_info *mtd = pci_get_drvdata(dev);
struct map_pci_info *map = mtd->priv; struct map_pci_info *map = mtd->priv;
del_mtd_device(mtd); mtd_device_unregister(mtd);
map_destroy(mtd); map_destroy(mtd);
map->exit(dev, map); map->exit(dev, map);
kfree(map); kfree(map);

4
drivers/mtd/maps/pcmciamtd.c
View File

@ -630,7 +630,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
dev->pcmcia_map.copy_to = pcmcia_copy_to; dev->pcmcia_map.copy_to = pcmcia_copy_to;
} }
if(add_mtd_device(mtd)) { if (mtd_device_register(mtd, NULL, 0)) {
map_destroy(mtd); map_destroy(mtd);
dev->mtd_info = NULL; dev->mtd_info = NULL;
dev_err(&dev->p_dev->dev, dev_err(&dev->p_dev->dev,
@ -669,7 +669,7 @@ static void pcmciamtd_detach(struct pcmcia_device *link)
DEBUG(3, "link=0x%p", link); DEBUG(3, "link=0x%p", link);
if(dev->mtd_info) { 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_info(&dev->p_dev->dev, "mtd%d: Removing\n",
dev->mtd_info->index); dev->mtd_info->index);
map_destroy(dev->mtd_info); map_destroy(dev->mtd_info);

6
drivers/mtd/maps/pmcmsp-flash.c
View File

@ -173,7 +173,7 @@ static int __init init_msp_flash(void)
msp_flash[i] = do_map_probe("cfi_probe", &msp_maps[i]); msp_flash[i] = do_map_probe("cfi_probe", &msp_maps[i]);
if (msp_flash[i]) { if (msp_flash[i]) {
msp_flash[i]->owner = THIS_MODULE; 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 { } else {
printk(KERN_ERR "map probe failed for flash\n"); printk(KERN_ERR "map probe failed for flash\n");
ret = -ENXIO; ret = -ENXIO;
@ -188,7 +188,7 @@ static int __init init_msp_flash(void)
cleanup_loop: cleanup_loop:
while (i--) { while (i--) {
del_mtd_partitions(msp_flash[i]); mtd_device_unregister(msp_flash[i]);
map_destroy(msp_flash[i]); map_destroy(msp_flash[i]);
kfree(msp_maps[i].name); kfree(msp_maps[i].name);
iounmap(msp_maps[i].virt); iounmap(msp_maps[i].virt);
@ -207,7 +207,7 @@ static void __exit cleanup_msp_flash(void)
int i; int i;
for (i = 0; i < fcnt; i++) { for (i = 0; i < fcnt; i++) {
del_mtd_partitions(msp_flash[i]); mtd_device_unregister(msp_flash[i]);
map_destroy(msp_flash[i]); map_destroy(msp_flash[i]);
iounmap((void *)msp_maps[i].virt); iounmap((void *)msp_maps[i].virt);

4
drivers/mtd/maps/rpxlite.c
View File

@ -36,7 +36,7 @@ static int __init init_rpxlite(void)
mymtd = do_map_probe("cfi_probe", &rpxlite_map); mymtd = do_map_probe("cfi_probe", &rpxlite_map);
if (mymtd) { if (mymtd) {
mymtd->owner = THIS_MODULE; mymtd->owner = THIS_MODULE;
add_mtd_device(mymtd); mtd_device_register(mymtd, NULL, 0);
return 0; return 0;
} }
@ -47,7 +47,7 @@ static int __init init_rpxlite(void)
static void __exit cleanup_rpxlite(void) static void __exit cleanup_rpxlite(void)
{ {
if (mymtd) { if (mymtd) {
del_mtd_device(mymtd); mtd_device_unregister(mymtd);
map_destroy(mymtd); map_destroy(mymtd);
} }
if (rpxlite_map.virt) { if (rpxlite_map.virt) {

4
drivers/mtd/maps/sbc_gxx.c
View File

@ -182,7 +182,7 @@ static struct mtd_info *all_mtd;
static void cleanup_sbc_gxx(void) static void cleanup_sbc_gxx(void)
{ {
if( all_mtd ) { if( all_mtd ) {
del_mtd_partitions( all_mtd ); mtd_device_unregister(all_mtd);
map_destroy( all_mtd ); map_destroy( all_mtd );
} }
@ -223,7 +223,7 @@ static int __init init_sbc_gxx(void)
all_mtd->owner = THIS_MODULE; all_mtd->owner = THIS_MODULE;
/* Create MTD devices for each partition. */ /* 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; return 0;
} }

8
drivers/mtd/maps/sc520cdp.c
View File

@ -266,10 +266,10 @@ static int __init init_sc520cdp(void)
/* Combine the two flash banks into a single MTD device & register it: */ /* 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"); merged_mtd = mtd_concat_create(mymtd, 2, "SC520CDP Flash Banks #0 and #1");
if(merged_mtd) 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 */ 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); return(devices_found ? 0 : -ENXIO);
} }
@ -278,11 +278,11 @@ static void __exit cleanup_sc520cdp(void)
int i; int i;
if (merged_mtd) { if (merged_mtd) {
del_mtd_device(merged_mtd); mtd_device_unregister(merged_mtd);
mtd_concat_destroy(merged_mtd); mtd_concat_destroy(merged_mtd);
} }
if (mymtd[2]) if (mymtd[2])
del_mtd_device(mymtd[2]); mtd_device_unregister(mymtd[2]);
for (i = 0; i < NUM_FLASH_BANKS; i++) { for (i = 0; i < NUM_FLASH_BANKS; i++) {
if (mymtd[i]) if (mymtd[i])

6
drivers/mtd/maps/scb2_flash.c
View File

@ -180,7 +180,7 @@ scb2_flash_probe(struct pci_dev *dev, const struct pci_device_id *ent)
scb2_mtd->owner = THIS_MODULE; scb2_mtd->owner = THIS_MODULE;
if (scb2_fixup_mtd(scb2_mtd) < 0) { if (scb2_fixup_mtd(scb2_mtd) < 0) {
del_mtd_device(scb2_mtd); mtd_device_unregister(scb2_mtd);
map_destroy(scb2_mtd); map_destroy(scb2_mtd);
iounmap(scb2_ioaddr); iounmap(scb2_ioaddr);
if (!region_fail) 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_mtd->size,
(unsigned long long)(SCB2_WINDOW - 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; return 0;
} }
@ -207,7 +207,7 @@ scb2_flash_remove(struct pci_dev *dev)
if (scb2_mtd->lock) if (scb2_mtd->lock)
scb2_mtd->lock(scb2_mtd, 0, scb2_mtd->size); scb2_mtd->lock(scb2_mtd, 0, scb2_mtd->size);
del_mtd_device(scb2_mtd); mtd_device_unregister(scb2_mtd);
map_destroy(scb2_mtd); map_destroy(scb2_mtd);
iounmap(scb2_ioaddr); iounmap(scb2_ioaddr);

12
drivers/mtd/maps/solutionengine.c
View File

@ -89,7 +89,7 @@ static int __init init_soleng_maps(void)
eprom_mtd = do_map_probe("map_rom", &soleng_eprom_map); eprom_mtd = do_map_probe("map_rom", &soleng_eprom_map);
if (eprom_mtd) { if (eprom_mtd) {
eprom_mtd->owner = THIS_MODULE; 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); 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 */ #endif /* CONFIG_MTD_SUPERH_RESERVE */
if (nr_parts > 0) if (nr_parts > 0)
add_mtd_partitions(flash_mtd, parsed_parts, nr_parts); mtd_device_register(flash_mtd, parsed_parts, nr_parts);
else else
add_mtd_device(flash_mtd); mtd_device_register(flash_mtd, NULL, 0);
return 0; return 0;
} }
@ -114,14 +114,14 @@ static int __init init_soleng_maps(void)
static void __exit cleanup_soleng_maps(void) static void __exit cleanup_soleng_maps(void)
{ {
if (eprom_mtd) { if (eprom_mtd) {
del_mtd_device(eprom_mtd); mtd_device_unregister(eprom_mtd);
map_destroy(eprom_mtd); map_destroy(eprom_mtd);
} }
if (parsed_parts) if (parsed_parts)
del_mtd_partitions(flash_mtd); mtd_device_unregister(flash_mtd);
else else
del_mtd_device(flash_mtd); mtd_device_unregister(flash_mtd);
map_destroy(flash_mtd); map_destroy(flash_mtd);
} }

4
drivers/mtd/maps/sun_uflash.c
View File

@ -101,7 +101,7 @@ int uflash_devinit(struct platform_device *op, struct device_node *dp)
up->mtd->owner = THIS_MODULE; up->mtd->owner = THIS_MODULE;
add_mtd_device(up->mtd); mtd_device_register(up->mtd, NULL, 0);
dev_set_drvdata(&op->dev, up); 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); struct uflash_dev *up = dev_get_drvdata(&op->dev);
if (up->mtd) { if (up->mtd) {
del_mtd_device(up->mtd); mtd_device_unregister(up->mtd);
map_destroy(up->mtd); map_destroy(up->mtd);
} }
if (up->map.virt) { if (up->map.virt) {

4
drivers/mtd/maps/ts5500_flash.c
View File

@ -89,7 +89,7 @@ static int __init init_ts5500_map(void)
} }
mymtd->owner = THIS_MODULE; mymtd->owner = THIS_MODULE;
add_mtd_partitions(mymtd, ts5500_partitions, NUM_PARTITIONS); mtd_device_register(mymtd, ts5500_partitions, NUM_PARTITIONS);
return 0; return 0;
@ -102,7 +102,7 @@ err2:
static void __exit cleanup_ts5500_map(void) static void __exit cleanup_ts5500_map(void)
{ {
if (mymtd) { if (mymtd) {
del_mtd_partitions(mymtd); mtd_device_unregister(mymtd);
map_destroy(mymtd); map_destroy(mymtd);
} }

4
drivers/mtd/maps/tsunami_flash.c
View File

@ -76,7 +76,7 @@ static void __exit cleanup_tsunami_flash(void)
struct mtd_info *mtd; struct mtd_info *mtd;
mtd = tsunami_flash_mtd; mtd = tsunami_flash_mtd;
if (mtd) { if (mtd) {
del_mtd_device(mtd); mtd_device_unregister(mtd);
map_destroy(mtd); map_destroy(mtd);
} }
tsunami_flash_mtd = 0; tsunami_flash_mtd = 0;
@ -97,7 +97,7 @@ static int __init init_tsunami_flash(void)
} }
if (tsunami_flash_mtd) { if (tsunami_flash_mtd) {
tsunami_flash_mtd->owner = THIS_MODULE; tsunami_flash_mtd->owner = THIS_MODULE;
add_mtd_device(tsunami_flash_mtd); mtd_device_register(tsunami_flash_mtd, NULL, 0);
return 0; return 0;
} }
return -ENXIO; return -ENXIO;

4
drivers/mtd/maps/vmax301.c
View File

@ -138,7 +138,7 @@ static void __exit cleanup_vmax301(void)
for (i=0; i<2; i++) { for (i=0; i<2; i++) {
if (vmax_mtd[i]) { if (vmax_mtd[i]) {
del_mtd_device(vmax_mtd[i]); mtd_device_unregister(vmax_mtd[i]);
map_destroy(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]); vmax_mtd[i] = do_map_probe("map_rom", &vmax_map[i]);
if (vmax_mtd[i]) { if (vmax_mtd[i]) {
vmax_mtd[i]->owner = THIS_MODULE; vmax_mtd[i]->owner = THIS_MODULE;
add_mtd_device(vmax_mtd[i]); mtd_device_register(vmax_mtd[i], NULL, 0);
} }
} }

4
drivers/mtd/maps/vmu-flash.c
View File

@ -563,7 +563,7 @@ static void vmu_queryblocks(struct mapleq *mq)
goto fail_cache_create; goto fail_cache_create;
part_cur->pcache = pcache; part_cur->pcache = pcache;
error = add_mtd_device(mtd_cur); error = mtd_device_register(mtd_cur, NULL, 0);
if (error) if (error)
goto fail_mtd_register; goto fail_mtd_register;
@ -709,7 +709,7 @@ static void __devexit vmu_disconnect(struct maple_device *mdev)
for (x = 0; x < card->partitions; x++) { for (x = 0; x < card->partitions; x++) {
mpart = ((card->mtd)[x]).priv; mpart = ((card->mtd)[x]).priv;
mpart->mdev = NULL; mpart->mdev = NULL;
del_mtd_device(&((card->mtd)[x])); mtd_device_unregister(&((card->mtd)[x]));
kfree(((card->parts)[x]).name); kfree(((card->parts)[x]).name);
} }
kfree(card->parts); kfree(card->parts);

15
drivers/mtd/maps/wr_sbc82xx_flash.c
View File

@ -132,17 +132,20 @@ static int __init init_sbc82xx_flash(void)
nr_parts = parse_mtd_partitions(sbcmtd[i], part_probes, nr_parts = parse_mtd_partitions(sbcmtd[i], part_probes,
&sbcmtd_parts[i], 0); &sbcmtd_parts[i], 0);
if (nr_parts > 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; continue;
} }
/* No partitioning detected. Use default */ /* No partitioning detected. Use default */
if (i == 2) { if (i == 2) {
add_mtd_device(sbcmtd[i]); mtd_device_register(sbcmtd[i], NULL, 0);
} else if (i == bigflash) { } 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 { } 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; return 0;
@ -157,9 +160,9 @@ static void __exit cleanup_sbc82xx_flash(void)
continue; continue;
if (i<2 || sbcmtd_parts[i]) if (i<2 || sbcmtd_parts[i])
del_mtd_partitions(sbcmtd[i]); mtd_device_unregister(sbcmtd[i]);
else else
del_mtd_device(sbcmtd[i]); mtd_device_unregister(sbcmtd[i]);
kfree(sbcmtd_parts[i]); kfree(sbcmtd_parts[i]);
map_destroy(sbcmtd[i]); map_destroy(sbcmtd[i]);

4
drivers/mtd/nand/alauda.c
View File

@ -120,7 +120,7 @@ static void alauda_delete(struct kref *kref)
struct alauda *al = container_of(kref, struct alauda, kref); struct alauda *al = container_of(kref, struct alauda, kref);
if (al->mtd) { if (al->mtd) {
del_mtd_device(al->mtd); mtd_device_unregister(al->mtd);
kfree(al->mtd); kfree(al->mtd);
} }
usb_put_dev(al->dev); usb_put_dev(al->dev);
@ -592,7 +592,7 @@ static int alauda_init_media(struct alauda *al)
mtd->priv = al; mtd->priv = al;
mtd->owner = THIS_MODULE; mtd->owner = THIS_MODULE;
err = add_mtd_device(mtd); err = mtd_device_register(mtd, NULL, 0);
if (err) { if (err) {
err = -ENFILE; err = -ENFILE;
goto error; goto error;

2
drivers/mtd/nand/ams-delta.c
View File

@ -235,7 +235,7 @@ static int __devinit ams_delta_init(struct platform_device *pdev)
} }
/* Register the partitions */ /* Register the partitions */
add_mtd_partitions(ams_delta_mtd, partition_info, mtd_device_register(ams_delta_mtd, partition_info,
ARRAY_SIZE(partition_info)); ARRAY_SIZE(partition_info));
goto out; goto out;

3
drivers/mtd/nand/au1550nd.c
View File

@ -580,7 +580,8 @@ static int __init au1xxx_nand_init(void)
} }
/* Register the partitions */ /* Register the partitions */
add_mtd_partitions(au1550_mtd, partition_info, ARRAY_SIZE(partition_info)); mtd_device_register(au1550_mtd, partition_info,
ARRAY_SIZE(partition_info));
return 0; return 0;

8
drivers/mtd/nand/autcpu12.c
View File

@ -185,19 +185,19 @@ static int __init autcpu12_init(void)
/* Register the partitions */ /* Register the partitions */
switch (autcpu12_mtd->size) { switch (autcpu12_mtd->size) {
case SZ_16M: case SZ_16M:
add_mtd_partitions(autcpu12_mtd, partition_info16k, mtd_device_register(autcpu12_mtd, partition_info16k,
NUM_PARTITIONS16K); NUM_PARTITIONS16K);
break; break;
case SZ_32M: case SZ_32M:
add_mtd_partitions(autcpu12_mtd, partition_info32k, mtd_device_register(autcpu12_mtd, partition_info32k,
NUM_PARTITIONS32K); NUM_PARTITIONS32K);
break; break;
case SZ_64M: case SZ_64M:
add_mtd_partitions(autcpu12_mtd, partition_info64k, mtd_device_register(autcpu12_mtd, partition_info64k,
NUM_PARTITIONS64K); NUM_PARTITIONS64K);
break; break;
case SZ_128M: case SZ_128M:
add_mtd_partitions(autcpu12_mtd, partition_info128k, mtd_device_register(autcpu12_mtd, partition_info128k,
NUM_PARTITIONS128K); NUM_PARTITIONS128K);
break; break;
default: default:

2
drivers/mtd/nand/cmx270_nand.c
View File

@ -238,7 +238,7 @@ static int __init cmx270_init(void)
/* Register the partitions */ /* Register the partitions */
pr_notice("Using %s partition definition\n", part_type); pr_notice("Using %s partition definition\n", part_type);
ret = add_mtd_partitions(cmx270_nand_mtd, mtd_parts, mtd_parts_nb); ret = mtd_device_register(cmx270_nand_mtd, mtd_parts, mtd_parts_nb);
if (ret) if (ret)
goto err_scan; goto err_scan;

4
drivers/mtd/nand/denali.c
View File

@ -1644,7 +1644,7 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
goto failed_req_irq; goto failed_req_irq;
} }
ret = add_mtd_device(&denali->mtd); ret = mtd_device_register(&denali->mtd, NULL, 0);
if (ret) { if (ret) {
dev_err(&dev->dev, "Spectra: Failed to register MTD: %d\n", dev_err(&dev->dev, "Spectra: Failed to register MTD: %d\n",
ret); ret);
@ -1676,7 +1676,7 @@ static void denali_pci_remove(struct pci_dev *dev)
struct denali_nand_info *denali = pci_get_drvdata(dev); struct denali_nand_info *denali = pci_get_drvdata(dev);
nand_release(&denali->mtd); nand_release(&denali->mtd);
del_mtd_device(&denali->mtd); mtd_device_unregister(&denali->mtd);
denali_irq_cleanup(dev->irq, denali); denali_irq_cleanup(dev->irq, denali);

2
drivers/mtd/nand/gpio.c
View File

@ -316,7 +316,7 @@ static int __devinit gpio_nand_probe(struct platform_device *dev)
gpiomtd->plat.adjust_parts(&gpiomtd->plat, gpiomtd->plat.adjust_parts(&gpiomtd->plat,
gpiomtd->mtd_info.size); gpiomtd->mtd_info.size);
add_mtd_partitions(&gpiomtd->mtd_info, gpiomtd->plat.parts, mtd_device_register(&gpiomtd->mtd_info, gpiomtd->plat.parts,
gpiomtd->plat.num_parts); gpiomtd->plat.num_parts);
platform_set_drvdata(dev, gpiomtd); platform_set_drvdata(dev, gpiomtd);

4
drivers/mtd/nand/nandsim.c
View File

@ -2383,7 +2383,9 @@ static int __init ns_init_module(void)
goto err_exit; goto err_exit;
/* Register NAND partitions */ /* Register NAND partitions */
if ((retval = add_mtd_partitions(nsmtd, &nand->partitions[0], nand->nbparts)) != 0) retval = mtd_device_register(nsmtd, &nand->partitions[0],
nand->nbparts);
if (retval != 0)
goto err_exit; goto err_exit;
return 0; return 0;

2
drivers/mtd/nand/nuc900_nand.c
View File

@ -321,7 +321,7 @@ static int __devinit nuc900_nand_probe(struct platform_device *pdev)
goto fail3; goto fail3;
} }
add_mtd_partitions(&(nuc900_nand->mtd), partitions, mtd_device_register(&(nuc900_nand->mtd), partitions,
ARRAY_SIZE(partitions)); ARRAY_SIZE(partitions));
platform_set_drvdata(pdev, nuc900_nand); platform_set_drvdata(pdev, nuc900_nand);

2
drivers/mtd/nand/pasemi_nand.c
View File

@ -163,7 +163,7 @@ static int __devinit pasemi_nand_probe(struct platform_device *ofdev)
goto out_lpc; goto out_lpc;
} }
if (add_mtd_device(pasemi_nand_mtd)) { if (mtd_device_register(pasemi_nand_mtd, NULL, 0)) {
printk(KERN_ERR "pasemi_nand: Unable to register MTD device\n"); printk(KERN_ERR "pasemi_nand: Unable to register MTD device\n");
err = -ENODEV; err = -ENODEV;
goto out_lpc; goto out_lpc;

3
drivers/mtd/nand/rtc_from4.c
View File

@ -580,7 +580,8 @@ static int __init rtc_from4_init(void)
#endif #endif
/* Register the partitions */ /* Register the partitions */
ret = add_mtd_partitions(rtc_from4_mtd, partition_info, NUM_PARTITIONS); ret = mtd_device_register(rtc_from4_mtd, partition_info,
NUM_PARTITIONS);
if (ret) if (ret)
goto err_3; goto err_3;

2
drivers/mtd/nand/sh_flctl.c
View File

@ -867,7 +867,7 @@ static int __devinit flctl_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err; goto err;
add_mtd_partitions(flctl_mtd, pdata->parts, pdata->nr_parts); mtd_device_register(flctl_mtd, pdata->parts, pdata->nr_parts);
return 0; return 0;

2
drivers/mtd/nand/sm_common.c
View File

@ -139,7 +139,7 @@ int sm_register_device(struct mtd_info *mtd, int smartmedia)
if (ret) if (ret)
return ret; return ret;
return add_mtd_device(mtd); return mtd_device_register(mtd, NULL, 0);
} }
EXPORT_SYMBOL_GPL(sm_register_device); EXPORT_SYMBOL_GPL(sm_register_device);

2
drivers/mtd/nand/spia.c
View File

@ -149,7 +149,7 @@ static int __init spia_init(void)
} }
/* Register the partitions */ /* Register the partitions */
add_mtd_partitions(spia_mtd, partition_info, NUM_PARTITIONS); mtd_device_register(spia_mtd, partition_info, NUM_PARTITIONS);
/* Return happy */ /* Return happy */
return 0; return 0;

3
drivers/mtd/onenand/onenand_sim.c
View File

@ -539,7 +539,8 @@ static int __init onenand_sim_init(void)
return -ENXIO; return -ENXIO;
} }
add_mtd_partitions(&info->mtd, info->parts, ARRAY_SIZE(os_partitions)); mtd_device_register(&info->mtd, info->parts,
ARRAY_SIZE(os_partitions));
return 0; return 0;
} }

6
drivers/mtd/ubi/gluebi.c
View File

@ -365,7 +365,7 @@ static int gluebi_create(struct ubi_device_info *di,
vi->vol_id); vi->vol_id);
mutex_unlock(&devices_mutex); mutex_unlock(&devices_mutex);
if (add_mtd_device(mtd)) { if (mtd_device_register(mtd, NULL, 0)) {
err_msg("cannot add MTD device"); err_msg("cannot add MTD device");
kfree(mtd->name); kfree(mtd->name);
kfree(gluebi); kfree(gluebi);
@ -407,7 +407,7 @@ static int gluebi_remove(struct ubi_volume_info *vi)
return err; return err;
mtd = &gluebi->mtd; mtd = &gluebi->mtd;
err = del_mtd_device(mtd); err = mtd_device_unregister(mtd);
if (err) { if (err) {
err_msg("cannot remove fake MTD device %d, UBI device %d, " err_msg("cannot remove fake MTD device %d, UBI device %d, "
"volume %d, error %d", mtd->index, gluebi->ubi_num, "volume %d, error %d", mtd->index, gluebi->ubi_num,
@ -524,7 +524,7 @@ static void __exit ubi_gluebi_exit(void)
int err; int err;
struct mtd_info *mtd = &gluebi->mtd; struct mtd_info *mtd = &gluebi->mtd;
err = del_mtd_device(mtd); err = mtd_device_unregister(mtd);
if (err) if (err)
err_msg("error %d while removing gluebi MTD device %d, " err_msg("error %d while removing gluebi MTD device %d, "
"UBI device %d, volume %d - ignoring", err, "UBI device %d, volume %d - ignoring", err,

6
drivers/net/sfc/mtd.c
View File

@ -216,7 +216,7 @@ static void efx_mtd_remove_partition(struct efx_mtd_partition *part)
int rc; int rc;
for (;;) { for (;;) {
rc = del_mtd_device(&part->mtd); rc = mtd_device_unregister(&part->mtd);
if (rc != -EBUSY) if (rc != -EBUSY)
break; break;
ssleep(1); ssleep(1);
@ -268,7 +268,7 @@ static int efx_mtd_probe_device(struct efx_nic *efx, struct efx_mtd *efx_mtd)
part->mtd.write = efx_mtd->ops->write; part->mtd.write = efx_mtd->ops->write;
part->mtd.sync = efx_mtd_sync; part->mtd.sync = efx_mtd_sync;
if (add_mtd_device(&part->mtd)) if (mtd_device_register(&part->mtd, NULL, 0))
goto fail; goto fail;
} }
@ -280,7 +280,7 @@ fail:
--part; --part;
efx_mtd_remove_partition(part); efx_mtd_remove_partition(part);
} }
/* add_mtd_device() returns 1 if the MTD table is full */ /* mtd_device_register() returns 1 if the MTD table is full */
return -ENOMEM; return -ENOMEM;
} }