From: wenyou.yang@atmel.com (Wenyou Yang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 04/14] spi/spi-atmel: call unmapping on transfers buffers
Date: Tue, 19 Mar 2013 15:44:22 +0800 [thread overview]
Message-ID: <1363679062-3797-1-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1363678866-3567-1-git-send-email-wenyou.yang@atmel.com>
From: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: spi-devel-general at lists.sourceforge.net
Cc: linux-kernel at vger.kernel.org
[wenyou.yang at atmel.com: submit the patch]
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---
drivers/spi/spi-atmel.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index f3e1cd8..e3af244 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1049,6 +1049,7 @@ static int atmel_spi_remove(struct platform_device *pdev)
struct spi_master *master = platform_get_drvdata(pdev);
struct atmel_spi *as = spi_master_get_devdata(master);
struct spi_message *msg;
+ struct spi_transfer *xfer;
/* reset the hardware and block queue progress */
spin_lock_irq(&as->lock);
@@ -1060,9 +1061,10 @@ static int atmel_spi_remove(struct platform_device *pdev)
/* Terminate remaining queued transfers */
list_for_each_entry(msg, &as->queue, queue) {
- /* REVISIT unmapping the dma is a NOP on ARM and AVR32
- * but we shouldn't depend on that...
- */
+ list_for_each_entry(xfer, &msg->transfers, transfer_list) {
+ if (!msg->is_dma_mapped)
+ atmel_spi_dma_unmap_xfer(master, xfer);
+ }
msg->status = -ESHUTDOWN;
msg->complete(msg->context);
}
--
1.7.9.5
next prev parent reply other threads:[~2013-03-19 7:44 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-19 7:41 [PATCH v7 00/14] spi/spi-atmel: add dmaengine support for atmel spi controller and to test the device tree support Wenyou Yang
2013-03-19 7:42 ` [PATCH v7 01/14] spi/spi-atmel: detect the capabilities of SPI core by reading the VERSION register Wenyou Yang
2013-04-01 13:38 ` Mark Brown
2013-03-19 7:43 ` [PATCH v7 02/14] spi/spi-atmel: add support transfer on CS1, 2, 3, not only on CS0 Wenyou Yang
2013-04-01 13:41 ` Mark Brown
2013-03-19 7:43 ` [PATCH v7 03/14] spi/spi-atmel: add physical base address Wenyou Yang
2013-04-01 13:41 ` Mark Brown
2013-04-02 5:49 ` Yang, Wenyou
2013-04-02 6:17 ` Yang, Wenyou
2013-03-19 7:44 ` Wenyou Yang [this message]
2013-04-01 13:43 ` [PATCH v7 04/14] spi/spi-atmel: call unmapping on transfers buffers Mark Brown
2013-03-19 7:45 ` [PATCH v7 05/14] spi/spi-atmel: status information passed through controller data Wenyou Yang
2013-04-01 13:43 ` Mark Brown
2013-03-19 7:46 ` [PATCH v7 06/14] spi/spi-atmel: add flag to controller data for lock operations Wenyou Yang
2013-04-01 13:46 ` Mark Brown
2013-04-03 5:09 ` Yang, Wenyou
2013-03-19 7:46 ` [PATCH v7 07/14] spi/spi-atmel: add dmaengine support Wenyou Yang
2013-03-19 7:47 ` [PATCH v7 08/14] spi/spi-atmel: fix spi-atmel driver to adapt to slave_config changes Wenyou Yang
2013-04-01 13:51 ` Mark Brown
2013-04-02 5:45 ` Yang, Wenyou
2013-03-19 7:47 ` [PATCH v7 09/14] spi/spi-atmel: correct 16 bits transfers using PIO Wenyou Yang
2013-04-01 13:53 ` Mark Brown
2013-03-19 7:49 ` [PATCH v7 10/14] spi/spi-atmel: correct 16 bits transfers with DMA Wenyou Yang
2013-04-01 13:53 ` Mark Brown
2013-04-02 5:46 ` Yang, Wenyou
2013-03-19 7:49 ` [PATCH v7 11/14] ARM: at91: add clocks for spi dt entries Wenyou Yang
2013-03-19 7:50 ` [PATCH v7 12/14] ARM: dts: add spi nodes for atmel SoC Wenyou Yang
2013-03-19 7:51 ` [PATCH v7 13/14] ARM: dts: add spi nodes for the atmel boards Wenyou Yang
2013-03-19 7:52 ` [PATCH v7 14/14] ARM: dts: add pinctrl property for spi node for atmel SoC Wenyou Yang
2013-03-21 9:32 ` [PATCH v7 00/14] spi/spi-atmel: add dmaengine support for atmel spi controller and to test the device tree support Nicolas Ferre
2013-03-22 9:26 ` Nicolas Ferre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363679062-3797-1-git-send-email-wenyou.yang@atmel.com \
--to=wenyou.yang@atmel.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).