diff mbox

[11/12] ASoC: txx9: use dmaengine_terminate_all() API

Message ID 1413042040-28222-11-git-send-email-vinod.koul@intel.com (mailing list archive)
State Accepted
Headers show

Commit Message

Vinod Koul Oct. 11, 2014, 3:40 p.m. UTC
The drivers should use dmaengine_terminate_all() API instead of
accessing the device_control which will be deprecated soon

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/soc/txx9/txx9aclc.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

Comments

Vinod Koul Oct. 11, 2014, 3:54 p.m. UTC | #1
On Sat, Oct 11, 2014 at 06:21:47PM +0200, Lars-Peter Clausen wrote:
> On 10/11/2014 05:40 PM, Vinod Koul wrote:
> >The drivers should use dmaengine_terminate_all() API instead of
> >accessing the device_control which will be deprecated soon
> 
> I already send a similar patch a while ago. It is on it's way into 3.18.
I will drop this one then

I did grep the linux-next when I started on this and found no reductions
from what I had in dmaengine-next
Lars-Peter Clausen Oct. 11, 2014, 4:21 p.m. UTC | #2
On 10/11/2014 05:40 PM, Vinod Koul wrote:
> The drivers should use dmaengine_terminate_all() API instead of
> accessing the device_control which will be deprecated soon

I already send a similar patch a while ago. It is on it's way into 3.18.

>
> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mark Brown Oct. 13, 2014, 7:44 a.m. UTC | #3
On Sat, Oct 11, 2014 at 09:24:11PM +0530, Vinod Koul wrote:
> On Sat, Oct 11, 2014 at 06:21:47PM +0200, Lars-Peter Clausen wrote:

> > I already send a similar patch a while ago. It is on it's way into 3.18.

> I will drop this one then

> I did grep the linux-next when I started on this and found no reductions
> from what I had in dmaengine-next

It's ff495d3a8ea4d (ASoC: txx9: Don't opencode DMAengine API calls) from
August which is in Linus' tree now.
diff mbox

Patch

diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c
index f0829de..3b122cd 100644
--- a/sound/soc/txx9/txx9aclc.c
+++ b/sound/soc/txx9/txx9aclc.c
@@ -160,7 +160,7 @@  static void txx9aclc_dma_tasklet(unsigned long data)
 		void __iomem *base = drvdata->base;
 
 		spin_unlock_irqrestore(&dmadata->dma_lock, flags);
-		chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
+		dmaengine_terminate_all(chan);
 		/* first time */
 		for (i = 0; i < NR_DMA_CHAIN; i++) {
 			desc = txx9aclc_dma_submit(dmadata,
@@ -266,7 +266,7 @@  static int txx9aclc_pcm_close(struct snd_pcm_substream *substream)
 	struct dma_chan *chan = dmadata->dma_chan;
 
 	dmadata->frag_count = -1;
-	chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
+	dmaengine_terminate_all(chan);
 	return 0;
 }
 
@@ -398,8 +398,7 @@  static int txx9aclc_pcm_remove(struct snd_soc_platform *platform)
 		struct dma_chan *chan = dmadata->dma_chan;
 		if (chan) {
 			dmadata->frag_count = -1;
-			chan->device->device_control(chan,
-						     DMA_TERMINATE_ALL, 0);
+			dmaengine_terminate_all(chan);
 			dma_release_channel(chan);
 		}
 		dev->dmadata[i].dma_chan = NULL;