[MTD] Restore MTD_ROM and MTD_RAM types

Let's not attempt the abolition of mtd->type until/unless it's properly
thought through. And certainly, let's not do it by halves.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

8 files changed, 8 insertions, 8 deletions

diff --git a/drivers/mtd/chips/map_ram.c b/drivers/mtd/chips/map_ram.c
index 9b7c49930a76..763925747db6 100644
--- a/drivers/mtd/chips/map_ram.c
+++ b/drivers/mtd/chips/map_ram.c
@@ -64,7 +64,7 @@ static struct mtd_info *map_ram_probe(struct map_info *map)
         map->fldrv = &mapram_chipdrv;
         mtd->priv = map;
         mtd->name = map->name;
-        mtd->type = MTD_GENERIC_TYPE;
+        mtd->type = MTD_RAM;
         mtd->size = map->size;
         mtd->erase = mapram_erase;
         mtd->read = mapram_read;
diff --git a/drivers/mtd/chips/map_rom.c b/drivers/mtd/chips/map_rom.c
index d59ac0136510..bc6ee9ef8a31 100644
--- a/drivers/mtd/chips/map_rom.c
+++ b/drivers/mtd/chips/map_rom.c
@@ -40,7 +40,7 @@ static struct mtd_info *map_rom_probe(struct map_info *map)
         map->fldrv = &maprom_chipdrv;
         mtd->priv = map;
         mtd->name = map->name;
-        mtd->type = MTD_GENERIC_TYPE;
+        mtd->type = MTD_ROM;
         mtd->size = map->size;
         mtd->read = maprom_read;
         mtd->write = maprom_write;
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 1157182c2c8c..0d98c223c5fc 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -324,7 +324,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
 
         dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
         dev->mtd.erasesize = erase_size;
-        dev->mtd.type = MTD_GENERIC_TYPE;
+        dev->mtd.type = MTD_RAM;
         dev->mtd.flags = MTD_CAP_RAM;
         dev->mtd.erase = block2mtd_erase;
         dev->mtd.write = block2mtd_write;
diff --git a/drivers/mtd/devices/ms02-nv.c b/drivers/mtd/devices/ms02-nv.c
index a6466f923e7e..4ab7670770e4 100644
--- a/drivers/mtd/devices/ms02-nv.c
+++ b/drivers/mtd/devices/ms02-nv.c
@@ -218,7 +218,7 @@ static int __init ms02nv_init_one(ulong addr)
         fixsize = (size - (fixaddr - addr)) & ~(PAGE_SIZE - 1);
         mp->uaddr = phys_to_virt(fixaddr);
 
-        mtd->type = MTD_GENERIC_TYPE;
+        mtd->type = MTD_RAM;
         mtd->flags = MTD_CAP_RAM;
         mtd->size = fixsize;
         mtd->name = (char *)ms02nv_name;
diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c
index 8ab4b931215f..b4438eacfd80 100644
--- a/drivers/mtd/devices/mtdram.c
+++ b/drivers/mtd/devices/mtdram.c
@@ -103,7 +103,7 @@ int mtdram_init_device(struct mtd_info *mtd, void *mapped_address,
 
         /* Setup the MTD structure */
         mtd->name = name;
-        mtd->type = MTD_GENERIC_TYPE;
+        mtd->type = MTD_RAM;
         mtd->flags = MTD_CAP_RAM;
         mtd->size = size;
         mtd->writesize = 1;
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index e6daa74d5fc6..e09e416667d3 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -149,7 +149,7 @@ static int register_device(char *name, unsigned long start, unsigned long len)
         new->mtd.read = phram_read;
         new->mtd.write = phram_write;
         new->mtd.owner = THIS_MODULE;
-        new->mtd.type = MTD_GENERIC_TYPE;
+        new->mtd.type = MTD_RAM;
         new->mtd.erasesize = PAGE_SIZE;
 
         ret = -EAGAIN;
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index aa9f6c993125..666cce1bf60c 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -775,7 +775,7 @@ static int __init init_pmc551(void)
                 mtd->write      = pmc551_write;
                 mtd->point      = pmc551_point;
                 mtd->unpoint    = pmc551_unpoint;
-                mtd->type       = MTD_GENERIC_TYPE;
+                mtd->type       = MTD_RAM;
                 mtd->name       = "PMC551 RAM board";
                 mtd->erasesize  = 0x10000;
                 mtd->owner = THIS_MODULE;
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index fdb7a78b5304..b3f665e3c38b 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -207,7 +207,7 @@ static int register_device(char *name, unsigned long start, unsigned long length
         (*curmtd)->mtdinfo->read = slram_read;
         (*curmtd)->mtdinfo->write = slram_write;
         (*curmtd)->mtdinfo->owner = THIS_MODULE;
-        (*curmtd)->mtdinfo->type = MTD_GENERIC_TYPE;
+        (*curmtd)->mtdinfo->type = MTD_RAM;
         (*curmtd)->mtdinfo->erasesize = SLRAM_BLK_SZ;
 
         if (add_mtd_device((*curmtd)->mtdinfo)) {