aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@tglx.tec.linutronix.de>2005-05-24 20:50:18 +0200
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-05-24 20:50:18 +0200
commit3a3ab48c68de656736f091c6ed768fa8c110a7ab (patch)
tree236d8fd4f1ce2ef32226689d254263c9c8d88219 /include/linux
parent22fd9a8750bcad4999768aafc8fbd8a4bd6f5aa1 (diff)
[MTD] Make map_word_ff ware of the flash buswidth
map_word_ff() was setting the mapword to ~0UL regardless of the buswidth of the mapped flash chip. The read_map functions are buswidth aware and therefor the map_word_equal function failed. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mtd/map.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index 115b14a634d..dd36d9433f0 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -1,6 +1,6 @@
/* Overhauled routines for dealing with different mmap regions of flash */
-/* $Id: map.h,v 1.48 2005/02/16 15:54:59 nico Exp $ */
+/* $Id: map.h,v 1.49 2005/05/24 18:45:15 gleixner Exp $ */
#ifndef __LINUX_MTD_MAP_H__
#define __LINUX_MTD_MAP_H__
@@ -340,13 +340,22 @@ static inline map_word map_word_load_partial(struct map_info *map, map_word orig
return orig;
}
+#if BITS_PER_LONG < 64
+#define MAP_FF_LIMIT 4
+#else
+#define MAP_FF_LIMIT 8
+#endif
+
static inline map_word map_word_ff(struct map_info *map)
{
map_word r;
int i;
-
- for (i=0; i<map_words(map); i++) {
- r.x[i] = ~0UL;
+
+ if (map_bank_width(map) < MAP_FF_LIMIT) {
+ r.x[0] = (1 << (8*map_bank_width(map))) - 1;
+ } else {
+ for (i=0; i<map_words(map); i++)
+ r.x[i] = ~0UL;
}
return r;
}