diff options
-rw-r--r-- | drivers/mtd/nand/nand_base.c | 6 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_ecc.c | 6 | ||||
-rw-r--r-- | include/linux/mtd/nand.h | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 582280560c89..d303db39c48d 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
@@ -801,9 +801,9 @@ static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip, | |||
801 | * nand_read_subpage - [REPLACABLE] software ecc based sub-page read function | 801 | * nand_read_subpage - [REPLACABLE] software ecc based sub-page read function |
802 | * @mtd: mtd info structure | 802 | * @mtd: mtd info structure |
803 | * @chip: nand chip info structure | 803 | * @chip: nand chip info structure |
804 | * @dataofs offset of requested data within the page | 804 | * @data_offs: offset of requested data within the page |
805 | * @readlen data length | 805 | * @readlen: data length |
806 | * @buf: buffer to store read data | 806 | * @bufpoi: buffer to store read data |
807 | */ | 807 | */ |
808 | static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, uint32_t data_offs, uint32_t readlen, uint8_t *bufpoi) | 808 | static int nand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, uint32_t data_offs, uint32_t readlen, uint8_t *bufpoi) |
809 | { | 809 | { |
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c index d99e569e999f..fd19787c9ce7 100644 --- a/drivers/mtd/nand/nand_ecc.c +++ b/drivers/mtd/nand/nand_ecc.c | |||
@@ -150,8 +150,8 @@ static const char addressbits[256] = { | |||
150 | /** | 150 | /** |
151 | * nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256-byte block | 151 | * nand_calculate_ecc - [NAND Interface] Calculate 3-byte ECC for 256-byte block |
152 | * @mtd: MTD block structure (unused) | 152 | * @mtd: MTD block structure (unused) |
153 | * @dat: raw data | 153 | * @buf: input buffer with raw data |
154 | * @ecc_code: buffer for ECC | 154 | * @code: output buffer with ECC |
155 | */ | 155 | */ |
156 | int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf, | 156 | int nand_calculate_ecc(struct mtd_info *mtd, const unsigned char *buf, |
157 | unsigned char *code) | 157 | unsigned char *code) |
@@ -390,7 +390,7 @@ EXPORT_SYMBOL(nand_calculate_ecc); | |||
390 | /** | 390 | /** |
391 | * nand_correct_data - [NAND Interface] Detect and correct bit error(s) | 391 | * nand_correct_data - [NAND Interface] Detect and correct bit error(s) |
392 | * @mtd: MTD block structure (unused) | 392 | * @mtd: MTD block structure (unused) |
393 | * @dat: raw data read from the chip | 393 | * @buf: raw data read from the chip |
394 | * @read_ecc: ECC from the chip | 394 | * @read_ecc: ECC from the chip |
395 | * @calc_ecc: the ECC calculated from raw data | 395 | * @calc_ecc: the ECC calculated from raw data |
396 | * | 396 | * |
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 81774e5facf4..733d3f3b4eb8 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h | |||
@@ -248,6 +248,7 @@ struct nand_hw_control { | |||
248 | * @read_page_raw: function to read a raw page without ECC | 248 | * @read_page_raw: function to read a raw page without ECC |
249 | * @write_page_raw: function to write a raw page without ECC | 249 | * @write_page_raw: function to write a raw page without ECC |
250 | * @read_page: function to read a page according to the ecc generator requirements | 250 | * @read_page: function to read a page according to the ecc generator requirements |
251 | * @read_subpage: function to read parts of the page covered by ECC. | ||
251 | * @write_page: function to write a page according to the ecc generator requirements | 252 | * @write_page: function to write a page according to the ecc generator requirements |
252 | * @read_oob: function to read chip OOB data | 253 | * @read_oob: function to read chip OOB data |
253 | * @write_oob: function to write chip OOB data | 254 | * @write_oob: function to write chip OOB data |