[alsa-devel] [PATCH 1/1] ASoC: soc-dmaengine-pcm: fix compile error since dma api is changed
From: Dong Aisheng dong.aisheng@linaro.org
The following compiling error is caused by the API device_prep_dma_cyclic is changed. Using dmaengine_prep_dma_cyclic to fix it.
sound/soc/soc-dmaengine-pcm.c: In function 'dmaengine_pcm_prepare_and_submit': sound/soc/soc-dmaengine-pcm.c:149: error: too few arguments to function 'chan->device->device_prep_dma_cyclic' make[2]: *** [sound/soc/soc-dmaengine-pcm.o] Error 1 make[1]: *** [sound/soc] Error 2 make: *** [sound] Error 2
Signed-off-by: Dong Aisheng dong.aisheng@linaro.org --- sound/soc/soc-dmaengine-pcm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c index 4420b70..4756952 100644 --- a/sound/soc/soc-dmaengine-pcm.c +++ b/sound/soc/soc-dmaengine-pcm.c @@ -143,7 +143,7 @@ static int dmaengine_pcm_prepare_and_submit(struct snd_pcm_substream *substream) direction = snd_pcm_substream_to_dma_direction(substream);
prtd->pos = 0; - desc = chan->device->device_prep_dma_cyclic(chan, + desc = dmaengine_prep_dma_cyclic(chan, substream->runtime->dma_addr, snd_pcm_lib_buffer_bytes(substream), snd_pcm_lib_period_bytes(substream), direction);
On 03/31/2012 02:37 PM, Dong Aisheng wrote:
From: Dong Aisheng dong.aisheng@linaro.org
The following compiling error is caused by the API device_prep_dma_cyclic is changed. Using dmaengine_prep_dma_cyclic to fix it.
sound/soc/soc-dmaengine-pcm.c: In function 'dmaengine_pcm_prepare_and_submit': sound/soc/soc-dmaengine-pcm.c:149: error: too few arguments to function 'chan->device->device_prep_dma_cyclic' make[2]: *** [sound/soc/soc-dmaengine-pcm.o] Error 1 make[1]: *** [sound/soc] Error 2 make: *** [sound] Error 2
Hi,
There is already a fix for this in Mark's for-3.4 branch.
-----Original Message----- From: Lars-Peter Clausen [mailto:lars@metafoo.de] Sent: Saturday, March 31, 2012 7:34 PM To: Dong Aisheng-B29396 Cc: alsa-devel@alsa-project.org; broonie@opensource.wolfsonmicro.com; lrg@ti.com; linux-arm-kernel@lists.infradead.org Subject: Re: [alsa-devel] [PATCH 1/1] ASoC: soc-dmaengine-pcm: fix compile error since dma api is changed Importance: High
On 03/31/2012 02:37 PM, Dong Aisheng wrote:
From: Dong Aisheng dong.aisheng@linaro.org
The following compiling error is caused by the API device_prep_dma_cyclic is changed. Using dmaengine_prep_dma_cyclic to
fix it.
sound/soc/soc-dmaengine-pcm.c: In function
'dmaengine_pcm_prepare_and_submit':
sound/soc/soc-dmaengine-pcm.c:149: error: too few arguments to function
'chan->device->device_prep_dma_cyclic'
make[2]: *** [sound/soc/soc-dmaengine-pcm.o] Error 1 make[1]: *** [sound/soc] Error 2 make: *** [sound] Error 2
Hi,
There is already a fix for this in Mark's for-3.4 branch.
Okay, thanks for reminder. I missed to check Mark's tree.
Regards Dong Aisheng
On Sat, 2012-03-31 at 12:39 +0000, Dong Aisheng-B29396 wrote:
sound/soc/soc-dmaengine-pcm.c: In function
'dmaengine_pcm_prepare_and_submit':
sound/soc/soc-dmaengine-pcm.c:149: error: too few arguments to
function
'chan->device->device_prep_dma_cyclic'
make[2]: *** [sound/soc/soc-dmaengine-pcm.o] Error 1 make[1]: *** [sound/soc] Error 2 make: *** [sound] Error 2
Hi,
There is already a fix for this in Mark's for-3.4 branch.
Okay, thanks for reminder. I missed to check Mark's tree.
This fix is there in rc1
participants (4)
-
Dong Aisheng
-
Dong Aisheng-B29396
-
Lars-Peter Clausen
-
Vinod Koul