aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-3.10/0106-mtd-nand-pxa3xx-Move-buffer-release-code-to-its-own-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0106-mtd-nand-pxa3xx-Move-buffer-release-code-to-its-own-.patch')
-rw-r--r--target/linux/mvebu/patches-3.10/0106-mtd-nand-pxa3xx-Move-buffer-release-code-to-its-own-.patch66
1 files changed, 66 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0106-mtd-nand-pxa3xx-Move-buffer-release-code-to-its-own-.patch b/target/linux/mvebu/patches-3.10/0106-mtd-nand-pxa3xx-Move-buffer-release-code-to-its-own-.patch
new file mode 100644
index 0000000000..b199fcf833
--- /dev/null
+++ b/target/linux/mvebu/patches-3.10/0106-mtd-nand-pxa3xx-Move-buffer-release-code-to-its-own-.patch
@@ -0,0 +1,66 @@
+From 49ff5bd7d4d51a8eb05796f130e9a1a96d18f522 Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Wed, 17 Apr 2013 13:38:14 -0300
+Subject: [PATCH 106/203] mtd: nand: pxa3xx: Move buffer release code to its
+ own function
+
+Create a function to release the buffer and the dma channel, thus undoing
+what pxa3xx_nand_init_buff() did. This commit makes the code more readable
+and will allow to handle non-DMA capable platforms easier.
+
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
+---
+ drivers/mtd/nand/pxa3xx_nand.c | 26 ++++++++++++++------------
+ 1 file changed, 14 insertions(+), 12 deletions(-)
+
+--- a/drivers/mtd/nand/pxa3xx_nand.c
++++ b/drivers/mtd/nand/pxa3xx_nand.c
+@@ -912,6 +912,18 @@ static int pxa3xx_nand_init_buff(struct
+ return 0;
+ }
+
++static void pxa3xx_nand_free_buff(struct pxa3xx_nand_info *info)
++{
++ struct platform_device *pdev = info->pdev;
++ if (use_dma) {
++ pxa_free_dma(info->data_dma_ch);
++ dma_free_coherent(&pdev->dev, MAX_BUFF_SIZE,
++ info->data_buff, info->data_buff_phys);
++ } else {
++ kfree(info->data_buff);
++ }
++}
++
+ static int pxa3xx_nand_sensing(struct pxa3xx_nand_info *info)
+ {
+ struct mtd_info *mtd;
+@@ -1137,12 +1149,7 @@ static int alloc_nand_resource(struct pl
+
+ fail_free_buf:
+ free_irq(irq, info);
+- if (use_dma) {
+- pxa_free_dma(info->data_dma_ch);
+- dma_free_coherent(&pdev->dev, MAX_BUFF_SIZE,
+- info->data_buff, info->data_buff_phys);
+- } else
+- kfree(info->data_buff);
++ pxa3xx_nand_free_buff(info);
+ fail_disable_clk:
+ clk_disable_unprepare(info->clk);
+ return ret;
+@@ -1163,12 +1170,7 @@ static int pxa3xx_nand_remove(struct pla
+ irq = platform_get_irq(pdev, 0);
+ if (irq >= 0)
+ free_irq(irq, info);
+- if (use_dma) {
+- pxa_free_dma(info->data_dma_ch);
+- dma_free_writecombine(&pdev->dev, MAX_BUFF_SIZE,
+- info->data_buff, info->data_buff_phys);
+- } else
+- kfree(info->data_buff);
++ pxa3xx_nand_free_buff(info);
+
+ clk_disable_unprepare(info->clk);
+