This will be needed in the next commit to call denali_read_page_raw()
from denali_read_page().

Signed-off-by: Masahiro Yamada <yamada.masah...@socionext.com>
---

 drivers/mtd/nand/denali.c | 76 +++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index c101e7f..f035dac 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -1118,6 +1118,44 @@ static int denali_read_oob(struct mtd_info *mtd, struct 
nand_chip *chip,
        return 0;
 }
 
+static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
+                               u8 *buf, int oob_required, int page)
+{
+       struct denali_nand_info *denali = mtd_to_denali(mtd);
+       dma_addr_t addr = denali->buf.dma_buf;
+       size_t size = mtd->writesize + mtd->oobsize;
+       u32 irq_mask = INTR_STATUS__DMA_CMD_COMP;
+
+       if (page != denali->page) {
+               dev_err(denali->dev,
+                       "IN %s: page %d is not equal to denali->page %d",
+                       __func__, page, denali->page);
+               BUG();
+       }
+
+       setup_ecc_for_xfer(denali, false, oob_required ? true : false);
+       denali_enable_dma(denali, true);
+
+       dma_sync_single_for_device(denali->dev, addr, size, DMA_FROM_DEVICE);
+
+       clear_interrupts(denali);
+       denali_setup_dma(denali, DENALI_READ);
+
+       /* wait for operation to complete */
+       wait_for_irq(denali, irq_mask);
+
+       dma_sync_single_for_cpu(denali->dev, addr, size, DMA_FROM_DEVICE);
+
+       denali_enable_dma(denali, false);
+
+       memcpy(buf, denali->buf.buf, mtd->writesize);
+       if (oob_required)
+               memcpy(chip->oob_poi, denali->buf.buf + mtd->writesize,
+                      mtd->oobsize);
+
+       return 0;
+}
+
 static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip,
                            u8 *buf, int oob_required, int page)
 {
@@ -1182,44 +1220,6 @@ static int denali_read_page(struct mtd_info *mtd, struct 
nand_chip *chip,
        return max_bitflips;
 }
 
-static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
-                               u8 *buf, int oob_required, int page)
-{
-       struct denali_nand_info *denali = mtd_to_denali(mtd);
-       dma_addr_t addr = denali->buf.dma_buf;
-       size_t size = mtd->writesize + mtd->oobsize;
-       u32 irq_mask = INTR_STATUS__DMA_CMD_COMP;
-
-       if (page != denali->page) {
-               dev_err(denali->dev,
-                       "IN %s: page %d is not equal to denali->page %d",
-                       __func__, page, denali->page);
-               BUG();
-       }
-
-       setup_ecc_for_xfer(denali, false, oob_required ? true : false);
-       denali_enable_dma(denali, true);
-
-       dma_sync_single_for_device(denali->dev, addr, size, DMA_FROM_DEVICE);
-
-       clear_interrupts(denali);
-       denali_setup_dma(denali, DENALI_READ);
-
-       /* wait for operation to complete */
-       wait_for_irq(denali, irq_mask);
-
-       dma_sync_single_for_cpu(denali->dev, addr, size, DMA_FROM_DEVICE);
-
-       denali_enable_dma(denali, false);
-
-       memcpy(buf, denali->buf.buf, mtd->writesize);
-       if (oob_required)
-               memcpy(chip->oob_poi, denali->buf.buf + mtd->writesize,
-                      mtd->oobsize);
-
-       return 0;
-}
-
 static u8 denali_read_byte(struct mtd_info *mtd)
 {
        struct denali_nand_info *denali = mtd_to_denali(mtd);
-- 
2.7.4

Reply via email to