mtd: nand: pxa3xx: Move DMA I/O enabling

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=95b26563c739d5ed5101318b1bd8895773a3d872
Commit:     95b26563c739d5ed5101318b1bd8895773a3d872
Parent:     867f770de8127d2e1dd730ce60608dfdac08d863
Author:     Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
AuthorDate: Fri Oct 4 15:30:37 2013 -0300
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Wed Nov 6 23:32:53 2013 -0800

    mtd: nand: pxa3xx: Move DMA I/O enabling
    
    Instead of setting info->dma each time a command is prepared,
    we can move it after the DMA buffers are allocated.
    
    This is more clear and it's the proper place to enable this, given
    DMA cannot be turned on and off during runtime.
    
    Signed-off-by: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
    Tested-by: Daniel Mack <zonque at gmail.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/nand/pxa3xx_nand.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index e08c3c0..2879974 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -540,7 +540,6 @@ static int prepare_command_pool(struct pxa3xx_nand_info *info, int command,
 	info->oob_size		= 0;
 	info->use_ecc		= 0;
 	info->use_spare		= 1;
-	info->use_dma		= (use_dma) ? 1 : 0;
 	info->is_ready		= 0;
 	info->retcode		= ERR_NONE;
 	if (info->cs != 0)
@@ -950,6 +949,11 @@ static int pxa3xx_nand_init_buff(struct pxa3xx_nand_info *info)
 		return info->data_dma_ch;
 	}
 
+	/*
+	 * Now that DMA buffers are allocated we turn on
+	 * DMA proper for I/O operations.
+	 */
+	info->use_dma = 1;
 	return 0;
 }