From: wenyou.yang@atmel.com (Wenyou Yang)
To: linux-arm-kernel@lists.infradead.org
Subject: [v4 PATCH 02/12] spi/atmel_spi: call unmapping on transfers buffers
Date: Mon, 14 Jan 2013 15:34:27 +0800 [thread overview]
Message-ID: <1358148877-18679-3-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1358148877-18679-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: grant.likely at secretlab.ca
Cc: spi-devel-general at lists.sourceforge.net
---
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 4516839..9782206 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1016,6 +1016,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);
@@ -1027,9 +1028,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-01-14 7:34 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-14 7:34 [v4 PATCH 00/12] atmel spi controller with dmaengine and device tree support Wenyou Yang
2013-01-14 7:34 ` [v4 PATCH 01/12] spi/atmel_spi: add physical base address Wenyou Yang
2013-01-14 7:34 ` Wenyou Yang [this message]
2013-01-14 7:34 ` [v4 PATCH 03/12] spi/atmel_spi: status information passed through controller data Wenyou Yang
2013-01-14 7:34 ` [v4 PATCH 04/12] spi/atmel_spi: add flag to controller data for lock operations Wenyou Yang
2013-01-14 7:34 ` [v4 PATCH 05/12] spi/atmel_spi: update the dt support Wenyou Yang
2013-02-05 20:04 ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-06 1:19 ` Yang, Wenyou
2013-01-14 7:34 ` [v4 PATCH 06/12] spi/atmel_spi: add dmaengine support Wenyou Yang
2013-01-23 16:25 ` Richard Genoud
2013-01-24 0:44 ` Yang, Wenyou
2013-01-14 7:34 ` [v4 PATCH 07/12] spi/atmel_spi: fix spi-atmel driver to adapt to slave_config changes Wenyou Yang
2013-01-14 7:34 ` [v4 PATCH 08/12] spi/atmel_spi: correct 16 bits transfers using PIO Wenyou Yang
2013-01-14 7:34 ` [v4 PATCH 09/12] spi/atmel_spi: correct 16 bits transfer with DMA Wenyou Yang
2013-01-14 7:34 ` [v4 PATCH 10/12] ARM: at91: add clocks for spi dt entries Wenyou Yang
2013-01-14 7:34 ` [v4 PATCH 11/12] ARM: dts: add spi nodes for atmel SoC Wenyou Yang
2013-02-05 19:51 ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-06 1:35 ` Yang, Wenyou
2013-02-06 9:40 ` Nicolas Ferre
2013-01-14 7:34 ` [v4 PATCH 12/12] ARM: dts: add spi nodes for the atmel boards Wenyou Yang
2013-02-05 19:50 ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-06 1:34 ` Yang, Wenyou
2013-02-08 1:51 ` Yang, Wenyou
2013-02-08 16:55 ` Jean-Christophe PLAGNIOL-VILLARD
2013-01-18 8:46 ` [v4 PATCH 00/12] atmel spi controller with dmaengine and device tree support Richard Genoud
2013-01-18 9:31 ` Yang, Wenyou
2013-02-05 14:14 ` Grant Likely
2013-02-05 20:06 ` Jean-Christophe PLAGNIOL-VILLARD
2013-02-06 8:33 ` Yang, Wenyou
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=1358148877-18679-3-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