The patch titled
mtd: remove unchecked flags
has been added to the -mm tree. Its filename is
mtd-remove-unchecked-flags.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Joern Engel <joern@xxxxxxxxxxxxxxxxxxxx>
Several flags are set by some devices, but never checked. Remove them.
Signed-off-by: Joern Engel <joern@xxxxxxxxxxxxxxxxxxxx>
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/mtd/chips/map_ram.c | 2 +-
drivers/mtd/devices/phram.c | 2 +-
drivers/mtd/devices/slram.c | 3 +--
include/mtd/mtd-abi.h | 12 +++---------
4 files changed, 6 insertions(+), 13 deletions(-)
diff -puN drivers/mtd/chips/map_ram.c~mtd-remove-unchecked-flags drivers/mtd/chips/map_ram.c
--- 25/drivers/mtd/chips/map_ram.c~mtd-remove-unchecked-flags Thu Apr 13 15:45:38 2006
+++ 25-akpm/drivers/mtd/chips/map_ram.c Thu Apr 13 15:45:38 2006
@@ -70,7 +70,7 @@ static struct mtd_info *map_ram_probe(st
mtd->read = mapram_read;
mtd->write = mapram_write;
mtd->sync = mapram_nop;
- mtd->flags = MTD_CAP_RAM | MTD_VOLATILE;
+ mtd->flags = MTD_CAP_RAM;
mtd->erasesize = PAGE_SIZE;
while(mtd->size & (mtd->erasesize - 1))
diff -puN drivers/mtd/devices/phram.c~mtd-remove-unchecked-flags drivers/mtd/devices/phram.c
--- 25/drivers/mtd/devices/phram.c~mtd-remove-unchecked-flags Thu Apr 13 15:45:38 2006
+++ 25-akpm/drivers/mtd/devices/phram.c Thu Apr 13 15:45:38 2006
@@ -142,7 +142,7 @@ static int register_device(char *name, u
new->mtd.name = name;
new->mtd.size = len;
- new->mtd.flags = MTD_CAP_RAM | MTD_ERASEABLE | MTD_VOLATILE;
+ new->mtd.flags = MTD_CAP_RAM;
new->mtd.erase = phram_erase;
new->mtd.point = phram_point;
new->mtd.unpoint = phram_unpoint;
diff -puN drivers/mtd/devices/slram.c~mtd-remove-unchecked-flags drivers/mtd/devices/slram.c
--- 25/drivers/mtd/devices/slram.c~mtd-remove-unchecked-flags Thu Apr 13 15:45:38 2006
+++ 25-akpm/drivers/mtd/devices/slram.c Thu Apr 13 15:45:38 2006
@@ -200,8 +200,7 @@ static int register_device(char *name, u
(*curmtd)->mtdinfo->name = name;
(*curmtd)->mtdinfo->size = length;
- (*curmtd)->mtdinfo->flags = MTD_CLEAR_BITS | MTD_SET_BITS |
- MTD_WRITEB_WRITEABLE | MTD_VOLATILE | MTD_CAP_RAM;
+ (*curmtd)->mtdinfo->flags = MTD_CAP_RAM;
(*curmtd)->mtdinfo->erase = slram_erase;
(*curmtd)->mtdinfo->point = slram_point;
(*curmtd)->mtdinfo->unpoint = slram_unpoint;
diff -puN include/mtd/mtd-abi.h~mtd-remove-unchecked-flags include/mtd/mtd-abi.h
--- 25/include/mtd/mtd-abi.h~mtd-remove-unchecked-flags Thu Apr 13 15:45:38 2006
+++ 25-akpm/include/mtd/mtd-abi.h Thu Apr 13 15:45:38 2006
@@ -35,20 +35,14 @@ struct mtd_oob_buf {
#define MTD_CLEAR_BITS 1 // Bits can be cleared (flash)
#define MTD_SET_BITS 2 // Bits can be set
-#define MTD_ERASEABLE 4 // Has an erase function
-#define MTD_WRITEB_WRITEABLE 8 // Direct IO is possible
-#define MTD_VOLATILE 16 // Set for RAMs
-#define MTD_XIP 32 // eXecute-In-Place possible
-#define MTD_OOB 64 // Out-of-band data (NAND flash)
#define MTD_ECC 128 // Device capable of automatic ECC
-#define MTD_NO_VIRTBLOCKS 256 // Virtual blocks not allowed
#define MTD_PROGRAM_REGIONS 512 // Configurable Programming Regions
// Some common devices / combinations of capabilities
#define MTD_CAP_ROM 0
-#define MTD_CAP_RAM (MTD_CLEAR_BITS|MTD_SET_BITS|MTD_WRITEB_WRITEABLE)
-#define MTD_CAP_NORFLASH (MTD_CLEAR_BITS|MTD_ERASEABLE)
-#define MTD_CAP_NANDFLASH (MTD_CLEAR_BITS|MTD_ERASEABLE|MTD_OOB)
+#define MTD_CAP_RAM (MTD_CLEAR_BITS|MTD_SET_BITS)
+#define MTD_CAP_NORFLASH (MTD_CLEAR_BITS)
+#define MTD_CAP_NANDFLASH (MTD_CLEAR_BITS)
#define MTD_WRITEABLE (MTD_CLEAR_BITS|MTD_SET_BITS)
_
Patches currently in -mm which might be from joern@xxxxxxxxxxxxxxxxxxxx are
origin.patch
mtd-improve-parameter-parsing-for-block2mtd.patch
mtd-simplify-test-for-ram-devices.patch
mtd-make-mtdblock_ro-unconditionally-readonly.patch
mtd-remove-unchecked-flags.patch
mtd-remove-unused-types.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
