summaryrefslogtreecommitdiff
path: root/sound/soc/mxs/mxs-pcm.h
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-03-22 17:12:13 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 18:17:41 +0400
commitb7e5e91210fc9d40f93f87e386823e4ba9b32805 (patch)
tree40b5ead3e2e813845c389cece7a9a5735d2f62a0 /sound/soc/mxs/mxs-pcm.h
parent312bb4f626328fdc246c8d13082ab00e26e7d048 (diff)
downloadlinux-b7e5e91210fc9d40f93f87e386823e4ba9b32805.tar.xz
ASoC: mxs: Embed the mxs_dma_data struct in the mxs_pcm_dma_params struct
Currently the mxs_dma_data struct, which gets passed to the dmaengine driver, is allocated in the pcm driver's open callback. The mxs_dma_data struct has exactly one field which is initialized from the the same field in the mxs_pcm_dma_params struct. The mxs_pcm_dma_params struct gets passed to the pcm driver from the dai driver. Instead of taking this indirection embed the mxs_dma_data struct directly in the mxs_pcm_dma_params struct. This allows us to simplify the pcm driver quite a bit, since we don't have to care about memory managing the mxs_dma_data struct anymore. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Tested-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/mxs/mxs-pcm.h')
-rw-r--r--sound/soc/mxs/mxs-pcm.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/mxs/mxs-pcm.h b/sound/soc/mxs/mxs-pcm.h
index 35ba2ca42384..3aa918f9ed3e 100644
--- a/sound/soc/mxs/mxs-pcm.h
+++ b/sound/soc/mxs/mxs-pcm.h
@@ -19,8 +19,10 @@
#ifndef _MXS_PCM_H
#define _MXS_PCM_H
+#include <linux/fsl/mxs-dma.h>
+
struct mxs_pcm_dma_params {
- int chan_irq;
+ struct mxs_dma_data dma_data;
int chan_num;
};