diff options
author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-05-25 06:20:29 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-05-25 06:20:29 -0400 |
commit | b0435695cb3b3e0542c9a3f921f40b216ec37580 (patch) | |
tree | 1fd9699dacd03089d3818203d2959a6eb311675b /include/linux/mtd/map.h | |
parent | 3a3ab48c68de656736f091c6ed768fa8c110a7ab (diff) |
[MTD] map.h Use the correct macro and fix the resulting compiler warning
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/mtd/map.h')
-rw-r--r-- | include/linux/mtd/map.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h index dd36d9433f00..dbd7b9b510d3 100644 --- a/include/linux/mtd/map.h +++ b/include/linux/mtd/map.h | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | /* Overhauled routines for dealing with different mmap regions of flash */ | 2 | /* Overhauled routines for dealing with different mmap regions of flash */ |
3 | /* $Id: map.h,v 1.49 2005/05/24 18:45:15 gleixner Exp $ */ | 3 | /* $Id: map.h,v 1.51 2005/05/25 10:15:29 gleixner Exp $ */ |
4 | 4 | ||
5 | #ifndef __LINUX_MTD_MAP_H__ | 5 | #ifndef __LINUX_MTD_MAP_H__ |
6 | #define __LINUX_MTD_MAP_H__ | 6 | #define __LINUX_MTD_MAP_H__ |
@@ -351,8 +351,9 @@ static inline map_word map_word_ff(struct map_info *map) | |||
351 | map_word r; | 351 | map_word r; |
352 | int i; | 352 | int i; |
353 | 353 | ||
354 | if (map_bank_width(map) < MAP_FF_LIMIT) { | 354 | if (map_bankwidth(map) < MAP_FF_LIMIT) { |
355 | r.x[0] = (1 << (8*map_bank_width(map))) - 1; | 355 | int bw = 8 * map_bankwidth; |
356 | r.x[0] = (1 << bw) - 1; | ||
356 | } else { | 357 | } else { |
357 | for (i=0; i<map_words(map); i++) | 358 | for (i=0; i<map_words(map); i++) |
358 | r.x[i] = ~0UL; | 359 | r.x[i] = ~0UL; |