[MTD] NAND: Combined oob buffer so it's contiguous with data

Ditch the separate oobrbuf and oobwbuf fields from the chip buffers,
and use only a single buffer immediately after the data. This accommodates
NAND controllers such as the OLPC CAFÉ chip, which can't do scatter/gather
DMA so needs the OOB buffer to be contiguous with the data, for both read
and write.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

1 files changed, 1 insertions, 5 deletions

diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 70420bbae82b..6fc3e07497e0 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -286,9 +286,7 @@ struct nand_ecc_ctrl {
  * struct nand_buffers - buffer structure for read/write
  * @ecccalc:    buffer for calculated ecc
  * @ecccode:    buffer for ecc read from flash
- * @oobwbuf:    buffer for write oob data
  * @databuf:    buffer for data - dynamically sized
- * @oobrbuf:    buffer to read oob data
  *
  * Do not change the order of buffers. databuf and oobrbuf must be in
  * consecutive order.
@@ -296,9 +294,7 @@ struct nand_ecc_ctrl {
 struct nand_buffers {
         uint8_t ecccalc[NAND_MAX_OOBSIZE];
         uint8_t ecccode[NAND_MAX_OOBSIZE];
-        uint8_t oobwbuf[NAND_MAX_OOBSIZE];
-        uint8_t databuf[NAND_MAX_PAGESIZE];
-        uint8_t oobrbuf[NAND_MAX_OOBSIZE];
+        uint8_t databuf[NAND_MAX_PAGESIZE + NAND_MAX_OOBSIZE];
 };
 
 /**