[MTD] replace MTD_ROM with MTD_GENERIC_TYPE

No mtd user should ever check for the device type.  Instead, device features
should be checked by the flags - if at all.
As a first step towards type removal, change MTD_ROM into MTD_GENERIC_TYPE.

Signed-off-by: Joern Engel <joern@wh.fh-wedel.de>

diff --git a/drivers/mtd/chips/map_rom.c b/drivers/mtd/chips/map_rom.c
index 624c12c232c8b2989319fadc66236ec9026e81a3..d59ac01365108f1bc77c12c596d9d035a333027e 100644 (file)
--- a/drivers/mtd/chips/map_rom.c
+++ b/drivers/mtd/chips/map_rom.c
@@ -40,15 +40,13 @@ 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_ROM;
+       mtd->type = MTD_GENERIC_TYPE;
        mtd->size = map->size;
        mtd->read = maprom_read;
        mtd->write = maprom_write;
        mtd->sync = maprom_nop;
        mtd->flags = MTD_CAP_ROM;
-       mtd->erasesize = 131072;
-       while(mtd->size & (mtd->erasesize - 1))
-               mtd->erasesize >>= 1;
+       mtd->erasesize = map->size;
 
        __module_get(THIS_MODULE);
        return mtd;

diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index c11a589bdedf18d73bdb0febec30fcdc6e038632..1ce365bd31d27d9afb12f6202a951fe0ebd6b12c 100644 (file)
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -25,10 +25,10 @@ struct mtd_oob_buf {
 
 #define MTD_ABSENT             0
 #define MTD_RAM                        1
-#define MTD_ROM                        2
 #define MTD_NORFLASH           3
 #define MTD_NANDFLASH          4
 #define MTD_DATAFLASH          6
+#define MTD_GENERIC_TYPE       7
 
 #define MTD_WRITEABLE          0x400   /* Device is writeable */
 #define MTD_BIT_WRITEABLE      0x800   /* Single bits can be flipped */