Merge commit 'wd/master'

7 files changed, 53 insertions, 49 deletions

diff --git a/include/linux/mtd/bbm.h b/include/linux/mtd/bbm.h
index f194cf1..bffb25b 100644
--- a/include/linux/mtd/bbm.h
+++ b/include/linux/mtd/bbm.h
@@ -26,8 +26,8 @@
  * struct nand_bbt_descr - bad block table descriptor
  * @param options	options for this descriptor
  * @param pages		the page(s) where we find the bbt, used with
- * 			option BBT_ABSPAGE when bbt is searched,
- * 			then we store the found bbts pages here.
+ *			option BBT_ABSPAGE when bbt is searched,
+ *			then we store the found bbts pages here.
  *			Its an array and supports up to 8 chips now
  * @param offs		offset of the pattern in the oob area of the page
  * @param veroffs	offset of the bbt version counter in the oob are of the page
diff --git a/include/linux/mtd/doc2000.h b/include/linux/mtd/doc2000.h
index eeb1d7e..29f6767 100644
--- a/include/linux/mtd/doc2000.h
+++ b/include/linux/mtd/doc2000.h
@@ -19,8 +19,8 @@ struct DiskOnChip;
 #define DoC_DOCControl		0x1002
 #define DoC_FloorSelect		0x1003
 #define DoC_CDSNControl		0x1004
-#define DoC_CDSNDeviceSelect 	0x1005
-#define DoC_ECCConf 		0x1006
+#define DoC_CDSNDeviceSelect	0x1005
+#define DoC_ECCConf		0x1006
 #define DoC_2k_ECCStatus	0x1007
 
 #define DoC_CDSNSlowIO		0x100d
@@ -30,15 +30,15 @@ struct DiskOnChip;
 #define DoC_ECCSyndrome3	0x1013
 #define DoC_ECCSyndrome4	0x1014
 #define DoC_ECCSyndrome5	0x1015
-#define DoC_AliasResolution 	0x101b
+#define DoC_AliasResolution	0x101b
 #define DoC_ConfigInput		0x101c
-#define DoC_ReadPipeInit 	0x101d
-#define DoC_WritePipeTerm 	0x101e
-#define DoC_LastDataRead 	0x101f
-#define DoC_NOP 		0x1020
+#define DoC_ReadPipeInit	0x101d
+#define DoC_WritePipeTerm	0x101e
+#define DoC_LastDataRead	0x101f
+#define DoC_NOP			0x1020
 
-#define DoC_Mil_CDSN_IO 	0x0800
-#define DoC_2k_CDSN_IO 		0x1800
+#define DoC_Mil_CDSN_IO		0x0800
+#define DoC_2k_CDSN_IO		0x1800
 
 #define ReadDOC_(adr, reg)      ((volatile unsigned char)(*(volatile __u8 *)(((unsigned long)adr)+((reg)))))
 #define WriteDOC_(d, adr, reg)  do{ *(volatile __u8 *)(((unsigned long)adr)+((reg))) = (__u8)d; eieio();} while(0)
@@ -49,32 +49,32 @@ struct DiskOnChip;
 #define ReadDOC(adr, reg)      ReadDOC_(adr,DoC_##reg)
 #define WriteDOC(d, adr, reg)  WriteDOC_(d,adr,DoC_##reg)
 
-#define DOC_MODE_RESET 		0
-#define DOC_MODE_NORMAL 	1
-#define DOC_MODE_RESERVED1 	2
-#define DOC_MODE_RESERVED2 	3
-
-#define DOC_MODE_MDWREN 	4
-#define DOC_MODE_CLR_ERR 	0x80
-
-#define DOC_ChipID_UNKNOWN 	0x00
-#define DOC_ChipID_Doc2k 	0x20
-#define DOC_ChipID_DocMil 	0x30
-
-#define CDSN_CTRL_FR_B 		0x80
-#define CDSN_CTRL_ECC_IO 	0x20
-#define CDSN_CTRL_FLASH_IO 	0x10
-#define CDSN_CTRL_WP 		0x08
-#define CDSN_CTRL_ALE 		0x04
-#define CDSN_CTRL_CLE 		0x02
-#define CDSN_CTRL_CE 		0x01
-
-#define DOC_ECC_RESET 		0
-#define DOC_ECC_ERROR 		0x80
-#define DOC_ECC_RW 		0x20
-#define DOC_ECC__EN 		0x08
-#define DOC_TOGGLE_BIT 		0x04
-#define DOC_ECC_RESV 		0x02
+#define DOC_MODE_RESET		0
+#define DOC_MODE_NORMAL		1
+#define DOC_MODE_RESERVED1	2
+#define DOC_MODE_RESERVED2	3
+
+#define DOC_MODE_MDWREN		4
+#define DOC_MODE_CLR_ERR	0x80
+
+#define DOC_ChipID_UNKNOWN	0x00
+#define DOC_ChipID_Doc2k	0x20
+#define DOC_ChipID_DocMil	0x30
+
+#define CDSN_CTRL_FR_B		0x80
+#define CDSN_CTRL_ECC_IO	0x20
+#define CDSN_CTRL_FLASH_IO	0x10
+#define CDSN_CTRL_WP		0x08
+#define CDSN_CTRL_ALE		0x04
+#define CDSN_CTRL_CLE		0x02
+#define CDSN_CTRL_CE		0x01
+
+#define DOC_ECC_RESET		0
+#define DOC_ECC_ERROR		0x80
+#define DOC_ECC_RW		0x20
+#define DOC_ECC__EN		0x08
+#define DOC_TOGGLE_BIT		0x04
+#define DOC_ECC_RESV		0x02
 #define DOC_ECC_IGNORE		0x01
 
 /* We have to also set the reserved bit 1 for enable */
diff --git a/include/linux/mtd/mtd-abi.h b/include/linux/mtd/mtd-abi.h
index 3d1d416..72d7341 100644
--- a/include/linux/mtd/mtd-abi.h
+++ b/include/linux/mtd/mtd-abi.h
@@ -46,7 +46,7 @@ struct mtd_oob_buf {
 
 
 /* Types of automatic ECC/Checksum available */
-#define MTD_ECC_NONE		0 	/* No automatic ECC available */
+#define MTD_ECC_NONE		0	/* No automatic ECC available */
 #define MTD_ECC_RS_DiskOnChip	1	/* Automatic ECC on DiskOnChip */
 #define MTD_ECC_SW		2	/* SW ECC for Toshiba & Samsung devices */
 
@@ -55,7 +55,7 @@ struct mtd_oob_buf {
 #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_AUTOPL_USR	4	/* Use the given autoplacement scheme rather than using the default */
 
 struct mtd_info_user {
 	uint8_t type;
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 13e9080..71cb2d5 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -13,7 +13,7 @@
 
 #define MAX_MTD_DEVICES 16
 
-#define MTD_ERASE_PENDING      	0x01
+#define MTD_ERASE_PENDING	0x01
 #define MTD_ERASING		0x02
 #define MTD_ERASE_SUSPEND	0x04
 #define MTD_ERASE_DONE          0x08
@@ -202,7 +202,7 @@ static inline void mtd_erase_callback(struct erase_info *instr)
 
 #ifdef CONFIG_MTD_DEBUG
 #define DEBUG(n, args...)				\
- 	do {						\
+	do {						\
 		if (n <= CONFIG_MTD_DEBUG_VERBOSE)	\
 			printk(KERN_INFO args);		\
 	} while(0)
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 4cc4a7d..e2a25a6 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -385,6 +385,10 @@ struct nand_manufacturers {
 extern struct nand_flash_dev nand_flash_ids[];
 extern struct nand_manufacturers nand_manuf_ids[];
 
+#ifndef NAND_MAX_CHIPS
+#define NAND_MAX_CHIPS 8
+#endif
+
 /**
  * struct nand_bbt_descr - bad block table descriptor
  * @options:	options for this descriptor
diff --git a/include/linux/mtd/nand_legacy.h b/include/linux/mtd/nand_legacy.h
index a8769e7..b05e726 100644
--- a/include/linux/mtd/nand_legacy.h
+++ b/include/linux/mtd/nand_legacy.h
@@ -104,12 +104,12 @@ struct Nand {
 };
 
 struct nand_chip {
-	int 		page_shift;
-	u_char 		*data_buf;
-	u_char 		*data_cache;
+	int		page_shift;
+	u_char		*data_buf;
+	u_char		*data_cache;
 	int		cache_page;
-	u_char 		ecc_code_buf[6];
-	u_char 		reserved[2];
+	u_char		ecc_code_buf[6];
+	u_char		reserved[2];
 	char ChipID; /* Type of DiskOnChip */
 	struct Nand *chips;
 	int chipshift;
diff --git a/include/linux/mtd/nftl.h b/include/linux/mtd/nftl.h
index 4381306..b0337c3 100644
--- a/include/linux/mtd/nftl.h
+++ b/include/linux/mtd/nftl.h
@@ -89,11 +89,11 @@ struct NFTLrecord {
 	__u16 numvunits;
 	__u16 lastEUN;                  /* should be suppressed */
 	__u16 numfreeEUNs;
-	__u16 LastFreeEUN; 		/* To speed up finding a free EUN */
+	__u16 LastFreeEUN;		/* To speed up finding a free EUN */
 	__u32 nr_sects;
 	int head,sect,cyl;
-	__u16 *EUNtable; 		/* [numvunits]: First EUN for each virtual unit  */
-	__u16 *ReplUnitTable; 		/* [numEUNs]: ReplUnitNumber for each */
+	__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 */
 };