Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  DMAENGINE: extend the control command to include an arg
  async_tx: trim dma_async_tx_descriptor in 'no channel switch' case
  DMAENGINE: DMA40 fix for allocation of logical channel 0
  DMAENGINE: DMA40 support paused channel status
  dmaengine: mpc512x: Use resource_size
  DMA ENGINE: Do not reset 'private' of channel
  ioat: Remove duplicated devm_kzalloc() calls for ioatdma_device
  ioat3: disable cacheline-unaligned transfers for raid operations
  ioat2,3: convert to producer/consumer locking
  ioat: convert to circ_buf
  DMAENGINE: Support for ST-Ericssons DMA40 block v3
  async_tx: use of kzalloc/kfree requires the include of slab.h
  dmaengine: provide helper for setting txstate
  DMAENGINE: generic channel status v2
  DMAENGINE: generic slave control v2
  dma: timb-dma: Update comment and fix compiler warning
  dma: Add timb-dma
  DMAENGINE: COH 901 318 fix bytesleft
  DMAENGINE: COH 901 318 rename confusing vars

1 files changed, 4 insertions, 3 deletions

diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c
index 49cc7ea9a518..0e3452303ea6 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_terminate_all(chan);
+                chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
                 /* first time */
                 for (i = 0; i < NR_DMA_CHAIN; i++) {
                         desc = txx9aclc_dma_submit(dmadata,
@@ -268,7 +268,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_terminate_all(chan);
+        chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
         return 0;
 }
 
@@ -397,7 +397,8 @@ static int txx9aclc_pcm_remove(struct platform_device *pdev)
                 struct dma_chan *chan = dmadata->dma_chan;
                 if (chan) {
                         dmadata->frag_count = -1;
-                        chan->device->device_terminate_all(chan);
+                        chan->device->device_control(chan,
+                                                     DMA_TERMINATE_ALL, 0);
                         dma_release_channel(chan);
                 }
                 dev->dmadata[i].dma_chan = NULL;