linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "Bryan O'Donoghue" <pure.logic@nexus-software.ie>,
	Peter Hurley <peter@hurleysoftware.com>,
	linux-serial@vger.kernel.org, Vinod Koul <vinod.koul@intel.com>,
	linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	ismo.puustinen@intel.com,
	Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v9 05/11] serial: 8250_dma: switch to new dmaengine_terminate_* API
Date: Mon, 20 Jun 2016 12:17:56 +0300	[thread overview]
Message-ID: <1466414282-96691-6-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1466414282-96691-1-git-send-email-andriy.shevchenko@linux.intel.com>

Convert dmaengine_terminate_all() calls to synchronous and asynchronous
versions where appropriate.

Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/tty/serial/8250/8250_dma.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
index 7f33d1c..c759242 100644
--- a/drivers/tty/serial/8250/8250_dma.c
+++ b/drivers/tty/serial/8250/8250_dma.c
@@ -142,7 +142,7 @@ void serial8250_rx_dma_flush(struct uart_8250_port *p)
 	if (dma->rx_running) {
 		dmaengine_pause(dma->rxchan);
 		__dma_rx_complete(p);
-		dmaengine_terminate_all(dma->rxchan);
+		dmaengine_terminate_async(dma->rxchan);
 	}
 }
 
@@ -246,14 +246,14 @@ void serial8250_release_dma(struct uart_8250_port *p)
 		return;
 
 	/* Release RX resources */
-	dmaengine_terminate_all(dma->rxchan);
+	dmaengine_terminate_sync(dma->rxchan);
 	dma_free_coherent(dma->rxchan->device->dev, dma->rx_size, dma->rx_buf,
 			  dma->rx_addr);
 	dma_release_channel(dma->rxchan);
 	dma->rxchan = NULL;
 
 	/* Release TX resources */
-	dmaengine_terminate_all(dma->txchan);
+	dmaengine_terminate_sync(dma->txchan);
 	dma_unmap_single(dma->txchan->device->dev, dma->tx_addr,
 			 UART_XMIT_SIZE, DMA_TO_DEVICE);
 	dma_release_channel(dma->txchan);
-- 
2.8.1

  parent reply	other threads:[~2016-06-20  9:18 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-20  9:17 [PATCH v9 00/11] serial: 8250: split LPSS to 8250_lpss, enable DMA on Quark Andy Shevchenko
2016-06-20  9:17 ` [PATCH v9 01/11] dmaengine: dw: keep copy of custom slave config in dwc Andy Shevchenko
2016-06-20  9:17 ` [PATCH v9 02/11] dmaengine: dw: provide probe(), remove() stubs for users Andy Shevchenko
2016-06-20  9:17 ` [PATCH v9 03/11] dmaengine: dw: set polarity of handshake interface Andy Shevchenko
2016-06-20  9:17 ` [PATCH v9 04/11] dmaengine: dw: override LLP support if asked in platform data Andy Shevchenko
2016-06-20  9:17 ` Andy Shevchenko [this message]
2016-06-20  9:17 ` [PATCH v9 06/11] serial: 8250_dma: adjust DMA address of the UART Andy Shevchenko
2016-06-20  9:17 ` [PATCH v9 07/11] serial: 8250: enable AFE on ports where FIFO is 16 bytes Andy Shevchenko
2016-06-20  9:17 ` [PATCH v9 08/11] serial: 8250_lpss: split LPSS driver to separate module Andy Shevchenko
2016-06-20  9:18 ` [PATCH v9 09/11] serial: 8250_lpss: move Quark code from PCI driver Andy Shevchenko
2016-06-20  9:18 ` [PATCH v9 10/11] serial: 8250_lpss: enable MSI for Intel Quark Andy Shevchenko
2016-06-20  9:18 ` [PATCH v9 11/11] serial: 8250_lpss: enable DMA on Intel Quark UART Andy Shevchenko
2016-06-21 15:10 ` [PATCH v9 00/11] serial: 8250: split LPSS to 8250_lpss, enable DMA on Quark Bryan O'Donoghue
2016-06-21 15:46   ` Andy Shevchenko
2016-08-03 16:14   ` Andy Shevchenko

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=1466414282-96691-6-git-send-email-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=ismo.puustinen@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=peter@hurleysoftware.com \
    --cc=pure.logic@nexus-software.ie \
    --cc=vinod.koul@intel.com \
    /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).