diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2005-11-07 06:15:31 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-11-07 08:32:58 -0500 |
commit | 61ecfa8777d0bc8e33dc0e5c2cca9b3247da2d37 (patch) | |
tree | 8efec81cd9fc0c00b6ed5ebf749dcfe228e5dda4 /include/linux/mtd/cfi.h | |
parent | 03ead8427d65f6986a8bf5fd3f29a879348780ad (diff) |
[MTD] includes: Clean up trailing white spaces
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/mtd/cfi.h')
-rw-r--r-- | include/linux/mtd/cfi.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h index 360cf626c288..39f1430bd6d5 100644 --- a/include/linux/mtd/cfi.h +++ b/include/linux/mtd/cfi.h | |||
@@ -1,7 +1,7 @@ | |||
1 | 1 | ||
2 | /* Common Flash Interface structures | 2 | /* Common Flash Interface structures |
3 | * See http://support.intel.com/design/flash/technote/index.htm | 3 | * See http://support.intel.com/design/flash/technote/index.htm |
4 | * $Id: cfi.h,v 1.55 2005/08/06 04:40:42 nico Exp $ | 4 | * $Id: cfi.h,v 1.56 2005/11/07 11:14:54 gleixner Exp $ |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #ifndef __MTD_CFI_H__ | 7 | #ifndef __MTD_CFI_H__ |
@@ -82,8 +82,8 @@ static inline int cfi_interleave_supported(int i) | |||
82 | } | 82 | } |
83 | 83 | ||
84 | 84 | ||
85 | /* NB: these values must represents the number of bytes needed to meet the | 85 | /* NB: these values must represents the number of bytes needed to meet the |
86 | * device type (x8, x16, x32). Eg. a 32 bit device is 4 x 8 bytes. | 86 | * device type (x8, x16, x32). Eg. a 32 bit device is 4 x 8 bytes. |
87 | * These numbers are used in calculations. | 87 | * These numbers are used in calculations. |
88 | */ | 88 | */ |
89 | #define CFI_DEVICETYPE_X8 (8 / 8) | 89 | #define CFI_DEVICETYPE_X8 (8 / 8) |
@@ -259,7 +259,7 @@ static inline uint32_t cfi_build_cmd_addr(uint32_t cmd_ofs, int interleave, int | |||
259 | /* | 259 | /* |
260 | * Transforms the CFI command for the given geometry (bus width & interleave). | 260 | * Transforms the CFI command for the given geometry (bus width & interleave). |
261 | * It looks too long to be inline, but in the common case it should almost all | 261 | * It looks too long to be inline, but in the common case it should almost all |
262 | * get optimised away. | 262 | * get optimised away. |
263 | */ | 263 | */ |
264 | static inline map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cfi_private *cfi) | 264 | static inline map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cfi_private *cfi) |
265 | { | 265 | { |
@@ -268,7 +268,7 @@ static inline map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cf | |||
268 | unsigned long onecmd; | 268 | unsigned long onecmd; |
269 | int i; | 269 | int i; |
270 | 270 | ||
271 | /* We do it this way to give the compiler a fighting chance | 271 | /* We do it this way to give the compiler a fighting chance |
272 | of optimising away all the crap for 'bankwidth' larger than | 272 | of optimising away all the crap for 'bankwidth' larger than |
273 | an unsigned long, in the common case where that support is | 273 | an unsigned long, in the common case where that support is |
274 | disabled */ | 274 | disabled */ |
@@ -279,7 +279,7 @@ static inline map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cf | |||
279 | wordwidth = map_bankwidth(map); | 279 | wordwidth = map_bankwidth(map); |
280 | words_per_bus = 1; | 280 | words_per_bus = 1; |
281 | } | 281 | } |
282 | 282 | ||
283 | chip_mode = map_bankwidth(map) / cfi_interleave(cfi); | 283 | chip_mode = map_bankwidth(map) / cfi_interleave(cfi); |
284 | chips_per_word = wordwidth * cfi_interleave(cfi) / map_bankwidth(map); | 284 | chips_per_word = wordwidth * cfi_interleave(cfi) / map_bankwidth(map); |
285 | 285 | ||
@@ -298,7 +298,7 @@ static inline map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cf | |||
298 | break; | 298 | break; |
299 | } | 299 | } |
300 | 300 | ||
301 | /* Now replicate it across the size of an unsigned long, or | 301 | /* Now replicate it across the size of an unsigned long, or |
302 | just to the bus width as appropriate */ | 302 | just to the bus width as appropriate */ |
303 | switch (chips_per_word) { | 303 | switch (chips_per_word) { |
304 | default: BUG(); | 304 | default: BUG(); |
@@ -314,7 +314,7 @@ static inline map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cf | |||
314 | ; | 314 | ; |
315 | } | 315 | } |
316 | 316 | ||
317 | /* And finally, for the multi-word case, replicate it | 317 | /* And finally, for the multi-word case, replicate it |
318 | in all words in the structure */ | 318 | in all words in the structure */ |
319 | for (i=0; i < words_per_bus; i++) { | 319 | for (i=0; i < words_per_bus; i++) { |
320 | val.x[i] = onecmd; | 320 | val.x[i] = onecmd; |
@@ -325,14 +325,14 @@ static inline map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cf | |||
325 | #define CMD(x) cfi_build_cmd((x), map, cfi) | 325 | #define CMD(x) cfi_build_cmd((x), map, cfi) |
326 | 326 | ||
327 | 327 | ||
328 | static inline unsigned long cfi_merge_status(map_word val, struct map_info *map, | 328 | static inline unsigned long cfi_merge_status(map_word val, struct map_info *map, |
329 | struct cfi_private *cfi) | 329 | struct cfi_private *cfi) |
330 | { | 330 | { |
331 | int wordwidth, words_per_bus, chip_mode, chips_per_word; | 331 | int wordwidth, words_per_bus, chip_mode, chips_per_word; |
332 | unsigned long onestat, res = 0; | 332 | unsigned long onestat, res = 0; |
333 | int i; | 333 | int i; |
334 | 334 | ||
335 | /* We do it this way to give the compiler a fighting chance | 335 | /* We do it this way to give the compiler a fighting chance |
336 | of optimising away all the crap for 'bankwidth' larger than | 336 | of optimising away all the crap for 'bankwidth' larger than |
337 | an unsigned long, in the common case where that support is | 337 | an unsigned long, in the common case where that support is |
338 | disabled */ | 338 | disabled */ |
@@ -343,7 +343,7 @@ static inline unsigned long cfi_merge_status(map_word val, struct map_info *map, | |||
343 | wordwidth = map_bankwidth(map); | 343 | wordwidth = map_bankwidth(map); |
344 | words_per_bus = 1; | 344 | words_per_bus = 1; |
345 | } | 345 | } |
346 | 346 | ||
347 | chip_mode = map_bankwidth(map) / cfi_interleave(cfi); | 347 | chip_mode = map_bankwidth(map) / cfi_interleave(cfi); |
348 | chips_per_word = wordwidth * cfi_interleave(cfi) / map_bankwidth(map); | 348 | chips_per_word = wordwidth * cfi_interleave(cfi) / map_bankwidth(map); |
349 | 349 | ||