diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 12:11:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 12:11:16 -0500 |
commit | e0d65113a70f1dc514e625cc4e7a7485a4bf72df (patch) | |
tree | 7320a130dc304623f5cf4b5dd8f67fb1776225ca /drivers/mtd/nand/au1550nd.c | |
parent | cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2 (diff) | |
parent | 48e546b7f281f251893baa40769581fd15f085fb (diff) |
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (226 commits)
mtd: tests: annotate as DANGEROUS in Kconfig
mtd: tests: don't use mtd0 as a default
mtd: clean up usage of MTD_DOCPROBE_ADDRESS
jffs2: add compr=lzo and compr=zlib options
jffs2: implement mount option parsing and compression overriding
mtd: nand: initialize ops.mode
mtd: provide an alias for the redboot module name
mtd: m25p80: don't probe device which has status of 'disabled'
mtd: nand_h1900 never worked
mtd: Add DiskOnChip G3 support
mtd: m25p80: add EON flash EN25Q32B into spi flash id table
mtd: mark block device queue as non-rotational
mtd: r852: make r852_pm_ops static
mtd: m25p80: add support for at25df321a spi data flash
mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
mtd: nand: switch `check_pattern()' to standard `memcmp()'
mtd: nand: invalidate cache on unaligned reads
mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
mtd: nand: wait to set BBT version
mtd: nand: scrub BBT on ECC errors
...
Fix up trivial conflicts:
- arch/arm/mach-at91/board-usb-a9260.c
Merged into board-usb-a926x.c
- drivers/mtd/maps/lantiq-flash.c
add_mtd_partitions -> mtd_device_register vs changed to use
mtd_device_parse_register.
Diffstat (limited to 'drivers/mtd/nand/au1550nd.c')
-rw-r--r-- | drivers/mtd/nand/au1550nd.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c index fa5736b9286c..7dd3700f2303 100644 --- a/drivers/mtd/nand/au1550nd.c +++ b/drivers/mtd/nand/au1550nd.c | |||
@@ -52,7 +52,7 @@ static const struct mtd_partition partition_info[] = { | |||
52 | * au_read_byte - read one byte from the chip | 52 | * au_read_byte - read one byte from the chip |
53 | * @mtd: MTD device structure | 53 | * @mtd: MTD device structure |
54 | * | 54 | * |
55 | * read function for 8bit buswith | 55 | * read function for 8bit buswidth |
56 | */ | 56 | */ |
57 | static u_char au_read_byte(struct mtd_info *mtd) | 57 | static u_char au_read_byte(struct mtd_info *mtd) |
58 | { | 58 | { |
@@ -67,7 +67,7 @@ static u_char au_read_byte(struct mtd_info *mtd) | |||
67 | * @mtd: MTD device structure | 67 | * @mtd: MTD device structure |
68 | * @byte: pointer to data byte to write | 68 | * @byte: pointer to data byte to write |
69 | * | 69 | * |
70 | * write function for 8it buswith | 70 | * write function for 8it buswidth |
71 | */ | 71 | */ |
72 | static void au_write_byte(struct mtd_info *mtd, u_char byte) | 72 | static void au_write_byte(struct mtd_info *mtd, u_char byte) |
73 | { | 73 | { |
@@ -77,11 +77,10 @@ static void au_write_byte(struct mtd_info *mtd, u_char byte) | |||
77 | } | 77 | } |
78 | 78 | ||
79 | /** | 79 | /** |
80 | * au_read_byte16 - read one byte endianess aware from the chip | 80 | * au_read_byte16 - read one byte endianness aware from the chip |
81 | * @mtd: MTD device structure | 81 | * @mtd: MTD device structure |
82 | * | 82 | * |
83 | * read function for 16bit buswith with | 83 | * read function for 16bit buswidth with endianness conversion |
84 | * endianess conversion | ||
85 | */ | 84 | */ |
86 | static u_char au_read_byte16(struct mtd_info *mtd) | 85 | static u_char au_read_byte16(struct mtd_info *mtd) |
87 | { | 86 | { |
@@ -92,12 +91,11 @@ static u_char au_read_byte16(struct mtd_info *mtd) | |||
92 | } | 91 | } |
93 | 92 | ||
94 | /** | 93 | /** |
95 | * au_write_byte16 - write one byte endianess aware to the chip | 94 | * au_write_byte16 - write one byte endianness aware to the chip |
96 | * @mtd: MTD device structure | 95 | * @mtd: MTD device structure |
97 | * @byte: pointer to data byte to write | 96 | * @byte: pointer to data byte to write |
98 | * | 97 | * |
99 | * write function for 16bit buswith with | 98 | * write function for 16bit buswidth with endianness conversion |
100 | * endianess conversion | ||
101 | */ | 99 | */ |
102 | static void au_write_byte16(struct mtd_info *mtd, u_char byte) | 100 | static void au_write_byte16(struct mtd_info *mtd, u_char byte) |
103 | { | 101 | { |
@@ -110,8 +108,7 @@ static void au_write_byte16(struct mtd_info *mtd, u_char byte) | |||
110 | * au_read_word - read one word from the chip | 108 | * au_read_word - read one word from the chip |
111 | * @mtd: MTD device structure | 109 | * @mtd: MTD device structure |
112 | * | 110 | * |
113 | * read function for 16bit buswith without | 111 | * read function for 16bit buswidth without endianness conversion |
114 | * endianess conversion | ||
115 | */ | 112 | */ |
116 | static u16 au_read_word(struct mtd_info *mtd) | 113 | static u16 au_read_word(struct mtd_info *mtd) |
117 | { | 114 | { |
@@ -127,7 +124,7 @@ static u16 au_read_word(struct mtd_info *mtd) | |||
127 | * @buf: data buffer | 124 | * @buf: data buffer |
128 | * @len: number of bytes to write | 125 | * @len: number of bytes to write |
129 | * | 126 | * |
130 | * write function for 8bit buswith | 127 | * write function for 8bit buswidth |
131 | */ | 128 | */ |
132 | static void au_write_buf(struct mtd_info *mtd, const u_char *buf, int len) | 129 | static void au_write_buf(struct mtd_info *mtd, const u_char *buf, int len) |
133 | { | 130 | { |
@@ -146,7 +143,7 @@ static void au_write_buf(struct mtd_info *mtd, const u_char *buf, int len) | |||
146 | * @buf: buffer to store date | 143 | * @buf: buffer to store date |
147 | * @len: number of bytes to read | 144 | * @len: number of bytes to read |
148 | * | 145 | * |
149 | * read function for 8bit buswith | 146 | * read function for 8bit buswidth |
150 | */ | 147 | */ |
151 | static void au_read_buf(struct mtd_info *mtd, u_char *buf, int len) | 148 | static void au_read_buf(struct mtd_info *mtd, u_char *buf, int len) |
152 | { | 149 | { |
@@ -165,7 +162,7 @@ static void au_read_buf(struct mtd_info *mtd, u_char *buf, int len) | |||
165 | * @buf: buffer containing the data to compare | 162 | * @buf: buffer containing the data to compare |
166 | * @len: number of bytes to compare | 163 | * @len: number of bytes to compare |
167 | * | 164 | * |
168 | * verify function for 8bit buswith | 165 | * verify function for 8bit buswidth |
169 | */ | 166 | */ |
170 | static int au_verify_buf(struct mtd_info *mtd, const u_char *buf, int len) | 167 | static int au_verify_buf(struct mtd_info *mtd, const u_char *buf, int len) |
171 | { | 168 | { |
@@ -187,7 +184,7 @@ static int au_verify_buf(struct mtd_info *mtd, const u_char *buf, int len) | |||
187 | * @buf: data buffer | 184 | * @buf: data buffer |
188 | * @len: number of bytes to write | 185 | * @len: number of bytes to write |
189 | * | 186 | * |
190 | * write function for 16bit buswith | 187 | * write function for 16bit buswidth |
191 | */ | 188 | */ |
192 | static void au_write_buf16(struct mtd_info *mtd, const u_char *buf, int len) | 189 | static void au_write_buf16(struct mtd_info *mtd, const u_char *buf, int len) |
193 | { | 190 | { |
@@ -209,7 +206,7 @@ static void au_write_buf16(struct mtd_info *mtd, const u_char *buf, int len) | |||
209 | * @buf: buffer to store date | 206 | * @buf: buffer to store date |
210 | * @len: number of bytes to read | 207 | * @len: number of bytes to read |
211 | * | 208 | * |
212 | * read function for 16bit buswith | 209 | * read function for 16bit buswidth |
213 | */ | 210 | */ |
214 | static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len) | 211 | static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len) |
215 | { | 212 | { |
@@ -230,7 +227,7 @@ static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len) | |||
230 | * @buf: buffer containing the data to compare | 227 | * @buf: buffer containing the data to compare |
231 | * @len: number of bytes to compare | 228 | * @len: number of bytes to compare |
232 | * | 229 | * |
233 | * verify function for 16bit buswith | 230 | * verify function for 16bit buswidth |
234 | */ | 231 | */ |
235 | static int au_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len) | 232 | static int au_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len) |
236 | { | 233 | { |