Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[MTD] includes: Clean up trailing white spaces

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

authored by

Thomas Gleixner and committed by
Thomas Gleixner
61ecfa87 03ead842

+118 -118
+1 -1
include/linux/mtd/bbm.h
··· 29 29 * @param version version read from the bbt page during scan 30 30 * @param len length of the pattern, if 0 no pattern check is performed 31 31 * @param maxblocks maximum number of blocks to search for a bbt. This number of 32 - * blocks is reserved at the end of the device 32 + * blocks is reserved at the end of the device 33 33 * where the tables are written. 34 34 * @param reserved_block_code if non-0, this pattern denotes a reserved 35 35 * (rather than bad) block in the stored bbt
+2 -2
include/linux/mtd/blktrans.h
··· 1 1 /* 2 - * $Id: blktrans.h,v 1.5 2003/06/23 12:00:08 dwmw2 Exp $ 2 + * $Id: blktrans.h,v 1.6 2005/11/07 11:14:54 gleixner Exp $ 3 3 * 4 4 * (C) 2003 David Woodhouse <dwmw2@infradead.org> 5 5 * ··· 67 67 extern int deregister_mtd_blktrans(struct mtd_blktrans_ops *tr); 68 68 extern int add_mtd_blktrans_dev(struct mtd_blktrans_dev *dev); 69 69 extern int del_mtd_blktrans_dev(struct mtd_blktrans_dev *dev); 70 - 70 + 71 71 72 72 #endif /* __MTD_TRANS_H__ */
+12 -12
include/linux/mtd/cfi.h
··· 1 1 2 - /* Common Flash Interface structures 2 + /* Common Flash Interface structures 3 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 7 #ifndef __MTD_CFI_H__ ··· 82 82 } 83 83 84 84 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. 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. 87 87 * These numbers are used in calculations. 88 88 */ 89 89 #define CFI_DEVICETYPE_X8 (8 / 8) ··· 259 259 /* 260 260 * Transforms the CFI command for the given geometry (bus width & interleave). 261 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 264 static inline map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cfi_private *cfi) 265 265 { ··· 268 268 unsigned long onecmd; 269 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 272 of optimising away all the crap for 'bankwidth' larger than 273 273 an unsigned long, in the common case where that support is 274 274 disabled */ ··· 279 279 wordwidth = map_bankwidth(map); 280 280 words_per_bus = 1; 281 281 } 282 - 282 + 283 283 chip_mode = map_bankwidth(map) / cfi_interleave(cfi); 284 284 chips_per_word = wordwidth * cfi_interleave(cfi) / map_bankwidth(map); 285 285 ··· 298 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 302 just to the bus width as appropriate */ 303 303 switch (chips_per_word) { 304 304 default: BUG(); ··· 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 318 in all words in the structure */ 319 319 for (i=0; i < words_per_bus; i++) { 320 320 val.x[i] = onecmd; ··· 325 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 329 struct cfi_private *cfi) 330 330 { 331 331 int wordwidth, words_per_bus, chip_mode, chips_per_word; 332 332 unsigned long onestat, res = 0; 333 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 336 of optimising away all the crap for 'bankwidth' larger than 337 337 an unsigned long, in the common case where that support is 338 338 disabled */ ··· 343 343 wordwidth = map_bankwidth(map); 344 344 words_per_bus = 1; 345 345 } 346 - 346 + 347 347 chip_mode = map_bankwidth(map) / cfi_interleave(cfi); 348 348 chips_per_word = wordwidth * cfi_interleave(cfi) / map_bankwidth(map); 349 349
+9 -9
include/linux/mtd/doc2000.h
··· 1 - /* 1 + /* 2 2 * Linux driver for Disk-On-Chip devices 3 3 * 4 - * Copyright (C) 1999 Machine Vision Holdings, Inc. 4 + * Copyright (C) 1999 Machine Vision Holdings, Inc. 5 5 * Copyright (C) 2001-2003 David Woodhouse <dwmw2@infradead.org> 6 6 * Copyright (C) 2002-2003 Greg Ungerer <gerg@snapgear.com> 7 7 * Copyright (C) 2002-2003 SnapGear Inc 8 8 * 9 - * $Id: doc2000.h,v 1.24 2005/01/05 12:40:38 dwmw2 Exp $ 9 + * $Id: doc2000.h,v 1.25 2005/11/07 11:14:54 gleixner Exp $ 10 10 * 11 11 * Released under GPL 12 12 */ ··· 75 75 #define DoC_Mplus_CtrlConfirm 0x1076 76 76 #define DoC_Mplus_Power 0x1fff 77 77 78 - /* How to access the device? 79 - * On ARM, it'll be mmap'd directly with 32-bit wide accesses. 78 + /* How to access the device? 79 + * On ARM, it'll be mmap'd directly with 32-bit wide accesses. 80 80 * On PPC, it's mmap'd and 16-bit wide. 81 - * Others use readb/writeb 81 + * Others use readb/writeb 82 82 */ 83 83 #if defined(__arm__) 84 84 #define ReadDOC_(adr, reg) ((unsigned char)(*(volatile __u32 *)(((unsigned long)adr)+((reg)<<2)))) ··· 172 172 unsigned long totlen; 173 173 unsigned char ChipID; /* Type of DiskOnChip */ 174 174 int ioreg; 175 - 175 + 176 176 unsigned long mfr; /* Flash IDs - only one type of flash per device */ 177 177 unsigned long id; 178 178 int chipshift; ··· 180 180 char pageadrlen; 181 181 char interleave; /* Internal interleaving - Millennium Plus style */ 182 182 unsigned long erasesize; 183 - 183 + 184 184 int curfloor; 185 185 int curchip; 186 - 186 + 187 187 int numchips; 188 188 struct Nand *chips; 189 189 struct mtd_info *nextdoc;
+7 -7
include/linux/mtd/flashchip.h
··· 1 1 2 - /* 2 + /* 3 3 * struct flchip definition 4 - * 5 - * Contains information about the location and state of a given flash device 4 + * 5 + * Contains information about the location and state of a given flash device 6 6 * 7 7 * (C) 2000 Red Hat. GPLd. 8 8 * 9 - * $Id: flashchip.h,v 1.17 2005/03/14 18:27:15 bjd Exp $ 9 + * $Id: flashchip.h,v 1.18 2005/11/07 11:14:54 gleixner Exp $ 10 10 * 11 11 */ 12 12 ··· 15 15 16 16 /* For spinlocks. sched.h includes spinlock.h from whichever directory it 17 17 * happens to be in - so we don't have to care whether we're on 2.2, which 18 - * has asm/spinlock.h, or 2.4, which has linux/spinlock.h 18 + * has asm/spinlock.h, or 2.4, which has linux/spinlock.h 19 19 */ 20 20 #include <linux/sched.h> 21 21 22 - typedef enum { 22 + typedef enum { 23 23 FL_READY, 24 24 FL_STATUS, 25 25 FL_CFI_QUERY, ··· 45 45 46 46 47 47 48 - /* NOTE: confusingly, this can be used to refer to more than one chip at a time, 48 + /* NOTE: confusingly, this can be used to refer to more than one chip at a time, 49 49 if they're interleaved. This can even refer to individual partitions on 50 50 the same physical chip when present. */ 51 51
+3 -3
include/linux/mtd/ftl.h
··· 1 1 /* 2 - * $Id: ftl.h,v 1.6 2003/01/24 13:20:04 dwmw2 Exp $ 3 - * 2 + * $Id: ftl.h,v 1.7 2005/11/07 11:14:54 gleixner Exp $ 3 + * 4 4 * Derived from (and probably identical to): 5 5 * ftl.h 1.7 1999/10/25 20:23:17 6 6 * ··· 12 12 * Software distributed under the License is distributed on an "AS IS" 13 13 * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See 14 14 * the License for the specific language governing rights and 15 - * limitations under the License. 15 + * limitations under the License. 16 16 * 17 17 * The initial developer of the original code is David A. Hinds 18 18 * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
+2 -2
include/linux/mtd/gen_probe.h
··· 1 1 /* 2 2 * (C) 2001, 2001 Red Hat, Inc. 3 3 * GPL'd 4 - * $Id: gen_probe.h,v 1.3 2004/10/20 22:10:33 dwmw2 Exp $ 4 + * $Id: gen_probe.h,v 1.4 2005/11/07 11:14:54 gleixner Exp $ 5 5 */ 6 6 7 7 #ifndef __LINUX_MTD_GEN_PROBE_H__ 8 8 #define __LINUX_MTD_GEN_PROBE_H__ 9 9 10 10 #include <linux/mtd/flashchip.h> 11 - #include <linux/mtd/map.h> 11 + #include <linux/mtd/map.h> 12 12 #include <linux/mtd/cfi.h> 13 13 #include <linux/bitops.h> 14 14
+10 -10
include/linux/mtd/jedec.h
··· 1 1 2 2 /* JEDEC Flash Interface. 3 - * This is an older type of interface for self programming flash. It is 3 + * This is an older type of interface for self programming flash. It is 4 4 * commonly use in older AMD chips and is obsolete compared with CFI. 5 5 * It is called JEDEC because the JEDEC association distributes the ID codes 6 6 * for the chips. 7 7 * 8 8 * See the AMD flash databook for information on how to operate the interface. 9 9 * 10 - * $Id: jedec.h,v 1.3 2003/05/21 11:51:01 dwmw2 Exp $ 10 + * $Id: jedec.h,v 1.4 2005/11/07 11:14:54 gleixner Exp $ 11 11 */ 12 12 13 13 #ifndef __LINUX_MTD_JEDEC_H__ ··· 33 33 __u16 jedec; 34 34 unsigned long size; 35 35 unsigned long sectorsize; 36 - 36 + 37 37 // *(__u8*)(base + (adder << addrshift)) = data << datashift 38 38 // Address size = size << addrshift 39 39 unsigned long base; // Byte 0 of the flash, will be unaligned 40 40 unsigned int datashift; // Useful for 32bit/16bit accesses 41 41 unsigned int addrshift; 42 42 unsigned long offset; // linerized start. base==offset for unbanked, uninterleaved flash 43 - 43 + 44 44 __u32 capabilities; 45 - 45 + 46 46 // These markers are filled in by the flash_chip_scan function 47 47 unsigned long start; 48 48 unsigned long length; ··· 51 51 struct jedec_private 52 52 { 53 53 unsigned long size; // Total size of all the devices 54 - 54 + 55 55 /* Bank handling. If sum(bank_fill) == size then this is linear flash. 56 56 Otherwise the mapping has holes in it. bank_fill may be used to 57 - find the holes, but in the common symetric case 58 - bank_fill[0] == bank_fill[*], thus addresses may be computed 57 + find the holes, but in the common symetric case 58 + bank_fill[0] == bank_fill[*], thus addresses may be computed 59 59 mathmatically. bank_fill must be powers of two */ 60 60 unsigned is_banked; 61 61 unsigned long bank_fill[MAX_JEDEC_CHIPS]; 62 - 63 - struct jedec_flash_chip chips[MAX_JEDEC_CHIPS]; 62 + 63 + struct jedec_flash_chip chips[MAX_JEDEC_CHIPS]; 64 64 }; 65 65 66 66 #endif
+7 -7
include/linux/mtd/map.h
··· 1 1 2 2 /* Overhauled routines for dealing with different mmap regions of flash */ 3 - /* $Id: map.h,v 1.52 2005/05/25 10:29:41 gleixner Exp $ */ 3 + /* $Id: map.h,v 1.54 2005/11/07 11:14:54 gleixner Exp $ */ 4 4 5 5 #ifndef __LINUX_MTD_MAP_H__ 6 6 #define __LINUX_MTD_MAP_H__ ··· 170 170 to a chip probe routine -- either JEDEC or CFI probe or both -- via 171 171 do_map_probe(). If a chip is recognised, the probe code will invoke the 172 172 appropriate chip driver (if present) and return a struct mtd_info. 173 - At which point, you fill in the mtd->module with your own module 173 + At which point, you fill in the mtd->module with your own module 174 174 address, and register it with the MTD core code. Or you could partition 175 175 it and register the partitions instead, or keep it for your own private 176 176 use; whatever. 177 - 177 + 178 178 The mtd->priv field will point to the struct map_info, and any further 179 - private data required by the chip driver is linked from the 180 - mtd->priv->fldrv_priv field. This allows the map driver to get at 179 + private data required by the chip driver is linked from the 180 + mtd->priv->fldrv_priv field. This allows the map driver to get at 181 181 the destructor function map->fldrv_destroy() when it's tired 182 182 of living. 183 183 */ ··· 214 214 If there is no cache to care about this can be set to NULL. */ 215 215 void (*inval_cache)(struct map_info *, unsigned long, ssize_t); 216 216 217 - /* set_vpp() must handle being reentered -- enable, enable, disable 217 + /* set_vpp() must handle being reentered -- enable, enable, disable 218 218 must leave it enabled. */ 219 219 void (*set_vpp)(struct map_info *, int); 220 220 ··· 353 353 { 354 354 map_word r; 355 355 int i; 356 - 356 + 357 357 if (map_bankwidth(map) < MAP_FF_LIMIT) { 358 358 int bw = 8 * map_bankwidth(map); 359 359 r.x[0] = (1 << bw) - 1;
+12 -12
include/linux/mtd/mtd.h
··· 1 - /* 2 - * $Id: mtd.h,v 1.60 2005/08/06 04:40:42 nico Exp $ 1 + /* 2 + * $Id: mtd.h,v 1.61 2005/11/07 11:14:54 gleixner Exp $ 3 3 * 4 4 * Copyright (C) 1999-2003 David Woodhouse <dwmw2@infradead.org> et al. 5 5 * ··· 90 90 91 91 // oobinfo is a nand_oobinfo structure, which can be set by iotcl (MEMSETOOBINFO) 92 92 struct nand_oobinfo oobinfo; 93 - u_int32_t oobavail; // Number of bytes in OOB area available for fs 93 + u_int32_t oobavail; // Number of bytes in OOB area available for fs 94 94 95 95 /* Data for variable erase regions. If numeraseregions is zero, 96 - * it means that the whole device has erasesize as given above. 96 + * it means that the whole device has erasesize as given above. 97 97 */ 98 98 int numeraseregions; 99 - struct mtd_erase_region_info *eraseregions; 99 + struct mtd_erase_region_info *eraseregions; 100 100 101 101 /* This really shouldn't be here. It can go away in 2.5 */ 102 102 u_int32_t bank_size; ··· 119 119 int (*read_oob) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf); 120 120 int (*write_oob) (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf); 121 121 122 - /* 123 - * Methods to access the protection register area, present in some 122 + /* 123 + * Methods to access the protection register area, present in some 124 124 * flash devices. The user data is one time programmable but the 125 - * factory data is read only. 125 + * factory data is read only. 126 126 */ 127 127 int (*get_fact_prot_info) (struct mtd_info *mtd, struct otp_info *buf, size_t len); 128 128 int (*read_fact_prot_reg) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf); ··· 133 133 134 134 /* kvec-based read/write methods. We need these especially for NAND flash, 135 135 with its limited number of write cycles per erase. 136 - NB: The 'count' parameter is the number of _vectors_, each of 136 + NB: The 'count' parameter is the number of _vectors_, each of 137 137 which contains an (ofs, len) tuple. 138 138 */ 139 139 int (*readv) (struct mtd_info *mtd, struct kvec *vecs, unsigned long count, loff_t from, size_t *retlen); 140 - int (*readv_ecc) (struct mtd_info *mtd, struct kvec *vecs, unsigned long count, loff_t from, 140 + int (*readv_ecc) (struct mtd_info *mtd, struct kvec *vecs, unsigned long count, loff_t from, 141 141 size_t *retlen, u_char *eccbuf, struct nand_oobinfo *oobsel); 142 142 int (*writev) (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, loff_t to, size_t *retlen); 143 - int (*writev_ecc) (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, loff_t to, 143 + int (*writev_ecc) (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, loff_t to, 144 144 size_t *retlen, u_char *eccbuf, struct nand_oobinfo *oobsel); 145 145 146 146 /* Sync */ ··· 204 204 #define MTD_WRITEECC(mtd, args...) (*(mtd->write_ecc))(mtd, args) 205 205 #define MTD_READOOB(mtd, args...) (*(mtd->read_oob))(mtd, args) 206 206 #define MTD_WRITEOOB(mtd, args...) (*(mtd->write_oob))(mtd, args) 207 - #define MTD_SYNC(mtd) do { if (mtd->sync) (*(mtd->sync))(mtd); } while (0) 207 + #define MTD_SYNC(mtd) do { if (mtd->sync) (*(mtd->sync))(mtd); } while (0) 208 208 209 209 210 210 #ifdef CONFIG_MTD_PARTITIONS
+27 -27
include/linux/mtd/nand.h
··· 24 24 * bat later if I did something naughty. 25 25 * 10-11-2000 SJH Added private NAND flash structure for driver 26 26 * 10-24-2000 SJH Added prototype for 'nand_scan' function 27 - * 10-29-2001 TG changed nand_chip structure to support 27 + * 10-29-2001 TG changed nand_chip structure to support 28 28 * hardwarespecific function for accessing control lines 29 29 * 02-21-2002 TG added support for different read/write adress and 30 30 * ready/busy line access function ··· 36 36 * CONFIG_MTD_NAND_ECC_JFFS2 is not set 37 37 * 08-10-2002 TG extensions to nand_chip structure to support HW-ECC 38 38 * 39 - * 08-29-2002 tglx nand_chip structure: data_poi for selecting 39 + * 08-29-2002 tglx nand_chip structure: data_poi for selecting 40 40 * internal / fs-driver buffer 41 41 * support for 6byte/512byte hardware ECC 42 42 * read_ecc, write_ecc extended for different oob-layout 43 43 * oob layout selections: NAND_NONE_OOB, NAND_JFFS2_OOB, 44 44 * NAND_YAFFS_OOB 45 45 * 11-25-2002 tglx Added Manufacturer code FUJITSU, NATIONAL 46 - * Split manufacturer and device ID structures 46 + * Split manufacturer and device ID structures 47 47 * 48 48 * 02-08-2004 tglx added option field to nand structure for chip anomalities 49 49 * 05-25-2004 tglx added bad block table support, ST-MICRO manufacturer id 50 50 * update of nand_chip structure description 51 - * 01-17-2005 dmarlin added extended commands for AG-AND device and added option 51 + * 01-17-2005 dmarlin added extended commands for AG-AND device and added option 52 52 * for BBT_AUTO_REFRESH. 53 - * 01-20-2005 dmarlin added optional pointer to hardware specific callback for 53 + * 01-20-2005 dmarlin added optional pointer to hardware specific callback for 54 54 * extra error status checks. 55 55 */ 56 56 #ifndef __LINUX_MTD_NAND_H ··· 120 120 #define NAND_CMD_CACHEDPROG 0x15 121 121 122 122 /* Extended commands for AG-AND device */ 123 - /* 124 - * Note: the command for NAND_CMD_DEPLETE1 is really 0x00 but 123 + /* 124 + * Note: the command for NAND_CMD_DEPLETE1 is really 0x00 but 125 125 * there is no way to distinguish that from NAND_CMD_READ0 126 126 * until the remaining sequence of commands has been completed 127 127 * so add a high order bit and mask it off in the command. ··· 145 145 #define NAND_STATUS_READY 0x40 146 146 #define NAND_STATUS_WP 0x80 147 147 148 - /* 148 + /* 149 149 * Constants for ECC_MODES 150 150 */ 151 151 ··· 191 191 #define NAND_CACHEPRG 0x00000008 192 192 /* Chip has copy back function */ 193 193 #define NAND_COPYBACK 0x00000010 194 - /* AND Chip which has 4 banks and a confusing page / block 194 + /* AND Chip which has 4 banks and a confusing page / block 195 195 * assignment. See Renesas datasheet for further information */ 196 196 #define NAND_IS_AND 0x00000020 197 197 /* Chip has a array of 4 pages which can be read without 198 198 * additional ready /busy waits */ 199 - #define NAND_4PAGE_ARRAY 0x00000040 199 + #define NAND_4PAGE_ARRAY 0x00000040 200 200 /* Chip requires that BBT is periodically rewritten to prevent 201 201 * bits from adjacent blocks from 'leaking' in altering data. 202 202 * This happens with the Renesas AG-AND chips, possibly others. */ ··· 219 219 /* Use a flash based bad block table. This option is passed to the 220 220 * default bad block table function. */ 221 221 #define NAND_USE_FLASH_BBT 0x00010000 222 - /* The hw ecc generator provides a syndrome instead a ecc value on read 223 - * This can only work if we have the ecc bytes directly behind the 222 + /* The hw ecc generator provides a syndrome instead a ecc value on read 223 + * This can only work if we have the ecc bytes directly behind the 224 224 * data bytes. Applies for DOC and AG-AND Renesas HW Reed Solomon generators */ 225 225 #define NAND_HWECC_SYNDROME 0x00020000 226 226 /* This option skips the bbt scan during initialization. */ ··· 252 252 253 253 /** 254 254 * struct nand_hw_control - Control structure for hardware controller (e.g ECC generator) shared among independend devices 255 - * @lock: protection lock 255 + * @lock: protection lock 256 256 * @active: the mtd device which holds the controller currently 257 257 * @wq: wait queue to sleep on if a NAND operation is in progress 258 258 * used instead of the per chip wait queue when a hw controller is available ··· 265 265 266 266 /** 267 267 * struct nand_chip - NAND Private Flash Chip Data 268 - * @IO_ADDR_R: [BOARDSPECIFIC] address to read the 8 I/O lines of the flash device 269 - * @IO_ADDR_W: [BOARDSPECIFIC] address to write the 8 I/O lines of the flash device 268 + * @IO_ADDR_R: [BOARDSPECIFIC] address to read the 8 I/O lines of the flash device 269 + * @IO_ADDR_W: [BOARDSPECIFIC] address to write the 8 I/O lines of the flash device 270 270 * @read_byte: [REPLACEABLE] read one byte from the chip 271 271 * @write_byte: [REPLACEABLE] write one byte to the chip 272 272 * @read_word: [REPLACEABLE] read one word from the chip ··· 289 289 * be provided if a hardware ECC is available 290 290 * @erase_cmd: [INTERN] erase command write function, selectable due to AND support 291 291 * @scan_bbt: [REPLACEABLE] function to scan bad block table 292 - * @eccmode: [BOARDSPECIFIC] mode of ecc, see defines 292 + * @eccmode: [BOARDSPECIFIC] mode of ecc, see defines 293 293 * @eccsize: [INTERN] databytes used per ecc-calculation 294 294 * @eccbytes: [INTERN] number of ecc bytes per ecc-calculation step 295 295 * @eccsteps: [INTERN] number of ecc calculation steps per page ··· 301 301 * @phys_erase_shift: [INTERN] number of address bits in a physical eraseblock 302 302 * @bbt_erase_shift: [INTERN] number of address bits in a bbt entry 303 303 * @chip_shift: [INTERN] number of address bits in one chip 304 - * @data_buf: [INTERN] internal buffer for one page + oob 304 + * @data_buf: [INTERN] internal buffer for one page + oob 305 305 * @oob_buf: [INTERN] oob buffer for one eraseblock 306 306 * @oobdirty: [INTERN] indicates that oob_buf must be reinitialized 307 307 * @data_poi: [INTERN] pointer to a data buffer ··· 316 316 * @bbt: [INTERN] bad block table pointer 317 317 * @bbt_td: [REPLACEABLE] bad block table descriptor for flash lookup 318 318 * @bbt_md: [REPLACEABLE] bad block table mirror descriptor 319 - * @badblock_pattern: [REPLACEABLE] bad block scan pattern used for initial bad block scan 319 + * @badblock_pattern: [REPLACEABLE] bad block scan pattern used for initial bad block scan 320 320 * @controller: [OPTIONAL] a pointer to a hardware controller structure which is shared among multiple independend devices 321 321 * @priv: [OPTIONAL] pointer to private chip date 322 - * @errstat: [OPTIONAL] hardware specific function to perform additional error status checks 322 + * @errstat: [OPTIONAL] hardware specific function to perform additional error status checks 323 323 * (determine if errors are correctable) 324 324 */ 325 - 325 + 326 326 struct nand_chip { 327 327 void __iomem *IO_ADDR_R; 328 328 void __iomem *IO_ADDR_W; 329 - 329 + 330 330 u_char (*read_byte)(struct mtd_info *mtd); 331 331 void (*write_byte)(struct mtd_info *mtd, u_char byte); 332 332 u16 (*read_word)(struct mtd_info *mtd); 333 333 void (*write_word)(struct mtd_info *mtd, u16 word); 334 - 334 + 335 335 void (*write_buf)(struct mtd_info *mtd, const u_char *buf, int len); 336 336 void (*read_buf)(struct mtd_info *mtd, u_char *buf, int len); 337 337 int (*verify_buf)(struct mtd_info *mtd, const u_char *buf, int len); ··· 396 396 * @name: Identify the device type 397 397 * @id: device ID code 398 398 * @pagesize: Pagesize in bytes. Either 256 or 512 or 0 399 - * If the pagesize is 0, then the real pagesize 399 + * If the pagesize is 0, then the real pagesize 400 400 * and the eraseize are determined from the 401 401 * extended id bytes in the chip 402 402 * @erasesize: Size of an erase block in the flash device. ··· 425 425 extern struct nand_flash_dev nand_flash_ids[]; 426 426 extern struct nand_manufacturers nand_manuf_ids[]; 427 427 428 - /** 428 + /** 429 429 * struct nand_bbt_descr - bad block table descriptor 430 430 * @options: options for this descriptor 431 431 * @pages: the page(s) where we find the bbt, used with option BBT_ABSPAGE ··· 436 436 * @version: version read from the bbt page during scan 437 437 * @len: length of the pattern, if 0 no pattern check is performed 438 438 * @maxblocks: maximum number of blocks to search for a bbt. This number of 439 - * blocks is reserved at the end of the device where the tables are 439 + * blocks is reserved at the end of the device where the tables are 440 440 * written. 441 441 * @reserved_block_code: if non-0, this pattern denotes a reserved (rather than 442 442 * bad) block in the stored bbt 443 - * @pattern: pattern to identify bad block table or factory marked good / 443 + * @pattern: pattern to identify bad block table or factory marked good / 444 444 * bad blocks, can be NULL, if len = 0 445 445 * 446 - * Descriptor for the bad block table marker and the descriptor for the 446 + * Descriptor for the bad block table marker and the descriptor for the 447 447 * pattern which identifies good and bad blocks. The assumption is made 448 448 * that the pattern and the version count are always located in the oob area 449 449 * of the first block.
+1 -1
include/linux/mtd/onenand.h
··· 77 77 * @param wq [INTERN] wait queue to sleep on if a OneNAND operation is in progress 78 78 * @param state [INTERN] the current state of the OneNAND device 79 79 * @param autooob [REPLACEABLE] the default (auto)placement scheme 80 - * @param bbm [REPLACEABLE] pointer to Bad Block Management 80 + * @param bbm [REPLACEABLE] pointer to Bad Block Management 81 81 * @param priv [OPTIONAL] pointer to private chip date 82 82 */ 83 83 struct onenand_chip {
+10 -10
include/linux/mtd/partitions.h
··· 5 5 * 6 6 * This code is GPL 7 7 * 8 - * $Id: partitions.h,v 1.16 2004/11/16 18:34:40 dwmw2 Exp $ 8 + * $Id: partitions.h,v 1.17 2005/11/07 11:14:55 gleixner Exp $ 9 9 */ 10 10 11 11 #ifndef MTD_PARTITIONS_H ··· 16 16 17 17 /* 18 18 * Partition definition structure: 19 - * 19 + * 20 20 * An array of struct partition is passed along with a MTD object to 21 21 * add_mtd_partitions() to create them. 22 22 * 23 23 * For each partition, these fields are available: 24 24 * name: string that will be used to label the partition's MTD device. 25 - * size: the partition size; if defined as MTDPART_SIZ_FULL, the partition 25 + * size: the partition size; if defined as MTDPART_SIZ_FULL, the partition 26 26 * will extend to the end of the master MTD device. 27 - * offset: absolute starting position within the master MTD device; if 28 - * defined as MTDPART_OFS_APPEND, the partition will start where the 27 + * offset: absolute starting position within the master MTD device; if 28 + * defined as MTDPART_OFS_APPEND, the partition will start where the 29 29 * previous one ended; if MTDPART_OFS_NXTBLK, at the next erase block. 30 - * mask_flags: contains flags that have to be masked (removed) from the 30 + * mask_flags: contains flags that have to be masked (removed) from the 31 31 * master MTD flag set for the corresponding MTD partition. 32 - * For example, to force a read-only partition, simply adding 32 + * For example, to force a read-only partition, simply adding 33 33 * MTD_WRITEABLE to the mask_flags will do the trick. 34 34 * 35 - * Note: writeable partitions require their size and offset be 35 + * Note: writeable partitions require their size and offset be 36 36 * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK). 37 - */ 37 + */ 38 38 39 39 struct mtd_partition { 40 40 char *name; /* identifier string */ ··· 66 66 67 67 extern int register_mtd_parser(struct mtd_part_parser *parser); 68 68 extern int deregister_mtd_parser(struct mtd_part_parser *parser); 69 - extern int parse_mtd_partitions(struct mtd_info *master, const char **types, 69 + extern int parse_mtd_partitions(struct mtd_info *master, const char **types, 70 70 struct mtd_partition **pparts, unsigned long origin); 71 71 72 72 #define put_partition_parser(p) do { module_put((p)->owner); } while(0)
+6 -6
include/linux/mtd/physmap.h
··· 1 1 /* 2 - * For boards with physically mapped flash and using 2 + * For boards with physically mapped flash and using 3 3 * drivers/mtd/maps/physmap.c mapping driver. 4 4 * 5 - * $Id: physmap.h,v 1.3 2004/07/21 00:16:15 jwboyer Exp $ 5 + * $Id: physmap.h,v 1.4 2005/11/07 11:14:55 gleixner Exp $ 6 6 * 7 7 * Copyright (C) 2003 MontaVista Software Inc. 8 8 * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net ··· 18 18 19 19 #include <linux/config.h> 20 20 21 - #if defined(CONFIG_MTD_PHYSMAP) 21 + #if defined(CONFIG_MTD_PHYSMAP) 22 22 23 23 #include <linux/mtd/mtd.h> 24 24 #include <linux/mtd/map.h> ··· 44 44 #if defined(CONFIG_MTD_PARTITIONS) 45 45 46 46 /* 47 - * Machines that wish to do flash partition may want to call this function in 48 - * their setup routine. 47 + * Machines that wish to do flash partition may want to call this function in 48 + * their setup routine. 49 49 * 50 50 * physmap_set_partitions(mypartitions, num_parts); 51 51 * 52 - * Note that one can always override this hard-coded partition with 52 + * Note that one can always override this hard-coded partition with 53 53 * command line partition (you need to enable CONFIG_MTD_CMDLINE_PARTS). 54 54 */ 55 55 void physmap_set_partitions(struct mtd_partition *parts, int num_parts);
+6 -6
include/linux/mtd/pmc551.h
··· 1 1 /* 2 - * $Id: pmc551.h,v 1.5 2003/01/24 16:49:53 dwmw2 Exp $ 2 + * $Id: pmc551.h,v 1.6 2005/11/07 11:14:55 gleixner Exp $ 3 3 * 4 4 * PMC551 PCI Mezzanine Ram Device 5 5 * ··· 7 7 * Mark Ferrell 8 8 * Copyright 1999,2000 Nortel Networks 9 9 * 10 - * License: 10 + * License: 11 11 * As part of this driver was derrived from the slram.c driver it falls 12 12 * under the same license, which is GNU General Public License v2 13 13 */ ··· 17 17 18 18 #include <linux/mtd/mtd.h> 19 19 20 - #define PMC551_VERSION "$Id: pmc551.h,v 1.5 2003/01/24 16:49:53 dwmw2 Exp $\n"\ 20 + #define PMC551_VERSION "$Id: pmc551.h,v 1.6 2005/11/07 11:14:55 gleixner Exp $\n"\ 21 21 "Ramix PMC551 PCI Mezzanine Ram Driver. (C) 1999,2000 Nortel Networks.\n" 22 22 23 23 /* ··· 30 30 u32 curr_map0; 31 31 u32 asize; 32 32 struct mtd_info *nextpmc551; 33 - }; 33 + }; 34 34 35 35 /* 36 36 * Function Prototypes ··· 39 39 static void pmc551_unpoint(struct mtd_info *, u_char *, loff_t, size_t); 40 40 static int pmc551_point (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char **mtdbuf); 41 41 static int pmc551_read(struct mtd_info *, loff_t, size_t, size_t *, u_char *); 42 - static int pmc551_write(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); 42 + static int pmc551_write(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); 43 43 44 44 45 45 /* ··· 50 50 #endif 51 51 52 52 #ifndef PCI_DEVICE_ID_V3_SEMI_V370PDC 53 - #define PCI_DEVICE_ID_V3_SEMI_V370PDC 0x0200 53 + #define PCI_DEVICE_ID_V3_SEMI_V370PDC 0x0200 54 54 #endif 55 55 56 56
+3 -3
include/linux/mtd/xip.h
··· 12 12 * it under the terms of the GNU General Public License version 2 as 13 13 * published by the Free Software Foundation. 14 14 * 15 - * $Id: xip.h,v 1.4 2005/10/17 21:03:16 nico Exp $ 15 + * $Id: xip.h,v 1.5 2005/11/07 11:14:55 gleixner Exp $ 16 16 */ 17 17 18 18 #ifndef __LINUX_MTD_XIP_H__ ··· 60 60 * overflowing. 61 61 * 62 62 * xip_iprefetch() 63 - * 63 + * 64 64 * Macro to fill instruction prefetch 65 - * e.g. a series of nops: asm volatile (".rep 8; nop; .endr"); 65 + * e.g. a series of nops: asm volatile (".rep 8; nop; .endr"); 66 66 */ 67 67 68 68 #include <asm/mtd-xip.h>