From 4b0708093e15b412296328bf81325cf9b69fe512 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Thu, 14 Aug 2008 14:41:06 +0200 Subject: Coding Style cleanup, update CHANGELOG Signed-off-by: Wolfgang Denk --- include/linux/mtd/inftl-user.h | 2 -- include/linux/mtd/mtd-abi.h | 16 ++++++++-------- include/linux/mtd/mtd.h | 8 ++++---- include/linux/mtd/nftl-user.h | 4 ++-- include/linux/mtd/nftl.h | 14 +++++++------- 5 files changed, 21 insertions(+), 23 deletions(-) (limited to 'include/linux') diff --git a/include/linux/mtd/inftl-user.h b/include/linux/mtd/inftl-user.h index 9b1e2526b..45220ed76 100644 --- a/include/linux/mtd/inftl-user.h +++ b/include/linux/mtd/inftl-user.h @@ -87,5 +87,3 @@ struct INFTLMediaHeader { #define INFTL_LAST 0x80000000 #endif /* __MTD_INFTL_USER_H__ */ - - diff --git a/include/linux/mtd/mtd-abi.h b/include/linux/mtd/mtd-abi.h index 0ce2099d6..410c5dd2f 100644 --- a/include/linux/mtd/mtd-abi.h +++ b/include/linux/mtd/mtd-abi.h @@ -35,18 +35,18 @@ struct mtd_oob_buf { #define MTD_NO_ERASE 0x1000 /* No erase necessary */ #define MTD_STUPID_LOCK 0x2000 /* Always locked after reset */ -// Some common devices / combinations of capabilities +/* Some common devices / combinations of capabilities */ #define MTD_CAP_ROM 0 #define MTD_CAP_RAM (MTD_WRITEABLE | MTD_BIT_WRITEABLE | MTD_NO_ERASE) #define MTD_CAP_NORFLASH (MTD_WRITEABLE | MTD_BIT_WRITEABLE) #define MTD_CAP_NANDFLASH (MTD_WRITEABLE) /* ECC byte placement */ -#define MTD_NANDECC_OFF 0 // Switch off ECC (Not recommended) -#define MTD_NANDECC_PLACE 1 // Use the given placement in the structure (YAFFS1 legacy mode) -#define MTD_NANDECC_AUTOPLACE 2 // Use the default placement scheme -#define MTD_NANDECC_PLACEONLY 3 // Use the given placement in the structure (Do not store ecc result on read) -#define MTD_NANDECC_AUTOPL_USR 4 // Use the given autoplacement scheme rather than using the default +#define MTD_NANDECC_OFF 0 /* Switch off ECC (Not recommended) */ +#define MTD_NANDECC_PLACE 1 /* Use the given placement in the structure (YAFFS1 legacy mode) */ +#define MTD_NANDECC_AUTOPLACE 2 /* Use the default placement scheme */ +#define MTD_NANDECC_PLACEONLY 3 /* Use the given placement in the structure (Do not store ecc result on read) */ +#define MTD_NANDECC_AUTOPL_USR 4 /* Use the given autoplacement scheme rather than using the default */ /* OTP mode selection */ #define MTD_OTP_OFF 0 @@ -56,10 +56,10 @@ struct mtd_oob_buf { struct mtd_info_user { uint8_t type; uint32_t flags; - uint32_t size; // Total size of the MTD + uint32_t size; /* Total size of the MTD */ uint32_t erasesize; uint32_t writesize; - uint32_t oobsize; // Amount of OOB data per block (e.g. 16) + uint32_t oobsize; /* Amount of OOB data per block (e.g. 16) */ /* The below two fields are obsolete and broken, do not use them * (TODO: remove at some point) */ uint32_t ecctype; diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 14815c219..55d33dd11 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -112,7 +112,7 @@ struct mtd_oob_ops { struct mtd_info { u_char type; u_int32_t flags; - u_int32_t size; // Total size of the MTD + u_int32_t size; /* Total size of the MTD */ /* "Major" erase size for the device. Naïve users may take this * to be the only erase size available, or may use the more detailed @@ -128,10 +128,10 @@ struct mtd_info { */ u_int32_t writesize; - u_int32_t oobsize; // Amount of OOB data per block (e.g. 16) - u_int32_t oobavail; // Available OOB bytes per block + u_int32_t oobsize; /* Amount of OOB data per block (e.g. 16) */ + u_int32_t oobavail; /* Available OOB bytes per block */ - // Kernel-only stuff starts here. + /* Kernel-only stuff starts here. */ char *name; int index; diff --git a/include/linux/mtd/nftl-user.h b/include/linux/mtd/nftl-user.h index b2bca18e7..22b8b707e 100644 --- a/include/linux/mtd/nftl-user.h +++ b/include/linux/mtd/nftl-user.h @@ -32,8 +32,8 @@ struct nftl_uci1 { } __attribute__((packed)); struct nftl_uci2 { - uint16_t FoldMark; - uint16_t FoldMark1; + uint16_t FoldMark; + uint16_t FoldMark1; uint32_t unused; } __attribute__((packed)); diff --git a/include/linux/mtd/nftl.h b/include/linux/mtd/nftl.h index 04963a52e..6731a16e7 100644 --- a/include/linux/mtd/nftl.h +++ b/include/linux/mtd/nftl.h @@ -13,10 +13,10 @@ #include /* these info are used in ReplUnitTable */ -#define BLOCK_NIL 0xffff /* last block of a chain */ -#define BLOCK_FREE 0xfffe /* free block */ +#define BLOCK_NIL 0xffff /* last block of a chain */ +#define BLOCK_FREE 0xfffe /* free block */ #define BLOCK_NOTEXPLORED 0xfffd /* non explored block, only used during mounting */ -#define BLOCK_RESERVED 0xfffc /* bios block or bad block */ +#define BLOCK_RESERVED 0xfffc /* bios block or bad block */ struct NFTLrecord { struct mtd_blktrans_dev mbd; @@ -28,15 +28,15 @@ struct NFTLrecord { unsigned char sectors; unsigned short cylinders; __u16 numvunits; - __u16 lastEUN; /* should be suppressed */ + __u16 lastEUN; /* should be suppressed */ __u16 numfreeEUNs; __u16 LastFreeEUN; /* To speed up finding a free EUN */ int head,sect,cyl; __u16 *EUNtable; /* [numvunits]: First EUN for each virtual unit */ __u16 *ReplUnitTable; /* [numEUNs]: ReplUnitNumber for each */ - unsigned int nb_blocks; /* number of physical blocks */ - unsigned int nb_boot_blocks; /* number of blocks used by the bios */ - struct erase_info instr; + unsigned int nb_blocks; /* number of physical blocks */ + unsigned int nb_boot_blocks; /* number of blocks used by the bios */ + struct erase_info instr; struct nand_ecclayout oobinfo; }; -- cgit v1.2.3