瀏覽代碼

[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>
Joern Engel 19 年之前
父節點
當前提交
e369d62e92
共有 2 個文件被更改,包括 3 次插入5 次删除
  1. 2 4
      drivers/mtd/chips/map_rom.c
  2. 1 1
      include/mtd/mtd-abi.h

+ 2 - 4
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;

+ 1 - 1
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 */