summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-04-22 21:57:24 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-23 11:34:29 +0100
commit6f1fd93e304f6f4f8b841e1b0124f3ab4c85ba2e (patch)
tree6c536149b1c1f4b1c9624590d5d8317f52958eb4 /sound
parent19133d2cfd9d6ad8365d94137dcd3e18f760c8e2 (diff)
downloadlinux-3.10-6f1fd93e304f6f4f8b841e1b0124f3ab4c85ba2e.tar.gz
linux-3.10-6f1fd93e304f6f4f8b841e1b0124f3ab4c85ba2e.tar.bz2
linux-3.10-6f1fd93e304f6f4f8b841e1b0124f3ab4c85ba2e.zip
ASoC: generic-dmaengine-pcm: call dma_request_slave_channel()
dma_request_slave_channel() is a more appropriate API for dmaengine clients that adopt generic DMA bindings to call. Let's use it instead of of_dma_request_slave_channel() to save <linux/of_dma.h> include. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-generic-dmaengine-pcm.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 98e131037fd..e29ec3cd84b 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -21,7 +21,6 @@
#include <sound/soc.h>
#include <linux/dma-mapping.h>
#include <linux/of.h>
-#include <linux/of_dma.h>
#include <sound/dmaengine_pcm.h>
@@ -219,19 +218,19 @@ static const char * const dmaengine_pcm_dma_channel_names[] = {
};
static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm,
- struct device_node *of_node)
+ struct device *dev)
{
unsigned int i;
- if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !of_node)
+ if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !dev->of_node)
return;
if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) {
- pcm->chan[0] = of_dma_request_slave_channel(of_node, "rx-tx");
+ pcm->chan[0] = dma_request_slave_channel(dev, "rx-tx");
pcm->chan[1] = pcm->chan[0];
} else {
for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) {
- pcm->chan[i] = of_dma_request_slave_channel(of_node,
+ pcm->chan[i] = dma_request_slave_channel(dev,
dmaengine_pcm_dma_channel_names[i]);
}
}
@@ -255,7 +254,7 @@ int snd_dmaengine_pcm_register(struct device *dev,
pcm->config = config;
pcm->flags = flags;
- dmaengine_pcm_request_chan_of(pcm, dev->of_node);
+ dmaengine_pcm_request_chan_of(pcm, dev);
if (flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE)
return snd_soc_add_platform(dev, &pcm->platform,