aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@cruncher.tec.linutronix.de>2006-05-23 05:52:35 -0400
committerThomas Gleixner <tglx@cruncher.tec.linutronix.de>2006-05-23 05:52:35 -0400
commit58dd8f2bfdcad1b219a4a92a2aadd8ea8c819f79 (patch)
tree8f98c9128a9e49ef181e06d6edda52f03210dc16 /include/linux
parent2c0a2bed9276ebbec5794edc07f66e21e9a1735c (diff)
[MTD] NAND consolidate data types
The NAND driver used a mix of unsigned char, u_char amd uint8_t data types. Consolidate to uint8_t usage Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mtd/nand.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 014ceefbec0e..601c5c703a05 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -294,14 +294,14 @@ struct nand_chip {
294 void __iomem *IO_ADDR_R; 294 void __iomem *IO_ADDR_R;
295 void __iomem *IO_ADDR_W; 295 void __iomem *IO_ADDR_W;
296 296
297 u_char (*read_byte)(struct mtd_info *mtd); 297 uint8_t (*read_byte)(struct mtd_info *mtd);
298 void (*write_byte)(struct mtd_info *mtd, u_char byte); 298 void (*write_byte)(struct mtd_info *mtd, uint8_t byte);
299 u16 (*read_word)(struct mtd_info *mtd); 299 u16 (*read_word)(struct mtd_info *mtd);
300 void (*write_word)(struct mtd_info *mtd, u16 word); 300 void (*write_word)(struct mtd_info *mtd, u16 word);
301 301
302 void (*write_buf)(struct mtd_info *mtd, const u_char *buf, int len); 302 void (*write_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);
303 void (*read_buf)(struct mtd_info *mtd, u_char *buf, int len); 303 void (*read_buf)(struct mtd_info *mtd, uint8_t *buf, int len);
304 int (*verify_buf)(struct mtd_info *mtd, const u_char *buf, int len); 304 int (*verify_buf)(struct mtd_info *mtd, const uint8_t *buf, int len);
305 void (*select_chip)(struct mtd_info *mtd, int chip); 305 void (*select_chip)(struct mtd_info *mtd, int chip);
306 int (*block_bad)(struct mtd_info *mtd, loff_t ofs, int getchip); 306 int (*block_bad)(struct mtd_info *mtd, loff_t ofs, int getchip);
307 int (*block_markbad)(struct mtd_info *mtd, loff_t ofs); 307 int (*block_markbad)(struct mtd_info *mtd, loff_t ofs);
@@ -309,8 +309,8 @@ struct nand_chip {
309 int (*dev_ready)(struct mtd_info *mtd); 309 int (*dev_ready)(struct mtd_info *mtd);
310 void (*cmdfunc)(struct mtd_info *mtd, unsigned command, int column, int page_addr); 310 void (*cmdfunc)(struct mtd_info *mtd, unsigned command, int column, int page_addr);
311 int (*waitfunc)(struct mtd_info *mtd, struct nand_chip *this, int state); 311 int (*waitfunc)(struct mtd_info *mtd, struct nand_chip *this, int state);
312 int (*calculate_ecc)(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code); 312 int (*calculate_ecc)(struct mtd_info *mtd, const uint8_t *dat, uint8_t *ecc_code);
313 int (*correct_data)(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc); 313 int (*correct_data)(struct mtd_info *mtd, uint8_t *dat, uint8_t *read_ecc, uint8_t *calc_ecc);
314 void (*enable_hwecc)(struct mtd_info *mtd, int mode); 314 void (*enable_hwecc)(struct mtd_info *mtd, int mode);
315 void (*erase_cmd)(struct mtd_info *mtd, int page); 315 void (*erase_cmd)(struct mtd_info *mtd, int page);
316 int (*scan_bbt)(struct mtd_info *mtd); 316 int (*scan_bbt)(struct mtd_info *mtd);
@@ -325,10 +325,10 @@ struct nand_chip {
325 int phys_erase_shift; 325 int phys_erase_shift;
326 int bbt_erase_shift; 326 int bbt_erase_shift;
327 int chip_shift; 327 int chip_shift;
328 u_char *data_buf; 328 uint8_t *data_buf;
329 u_char *oob_buf; 329 uint8_t *oob_buf;
330 int oobdirty; 330 int oobdirty;
331 u_char *data_poi; 331 uint8_t *data_poi;
332 unsigned int options; 332 unsigned int options;
333 int badblockpos; 333 int badblockpos;
334 int numchips; 334 int numchips;
@@ -466,7 +466,7 @@ extern int nand_default_bbt (struct mtd_info *mtd);
466extern int nand_isbad_bbt (struct mtd_info *mtd, loff_t offs, int allowbbt); 466extern int nand_isbad_bbt (struct mtd_info *mtd, loff_t offs, int allowbbt);
467extern int nand_erase_nand (struct mtd_info *mtd, struct erase_info *instr, int allowbbt); 467extern int nand_erase_nand (struct mtd_info *mtd, struct erase_info *instr, int allowbbt);
468extern int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len, 468extern int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
469 size_t * retlen, u_char * buf, u_char * oob_buf, 469 size_t * retlen, uint8_t * buf, uint8_t * oob_buf,
470 struct nand_oobinfo *oobsel, int flags); 470 struct nand_oobinfo *oobsel, int flags);
471 471
472/* 472/*