From 3285f998ef1556d81c8640505b68f2c047307c48 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 21 Feb 2012 17:47:55 +0100 Subject: [PATCH] --- yaml --- r: 293394 b: refs/heads/master c: e54e2f81da0aaf9e39d6f9b25fa08ce0bec9ca06 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/imx/imx-pcm-dma-mx2.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index ff5846c1396b..415104b10c3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07fb9d9e935a07aaed557c58d795c18fcd99aab4 +refs/heads/master: e54e2f81da0aaf9e39d6f9b25fa08ce0bec9ca06 diff --git a/trunk/sound/soc/imx/imx-pcm-dma-mx2.c b/trunk/sound/soc/imx/imx-pcm-dma-mx2.c index 5780c9b9d569..bc1df166385a 100644 --- a/trunk/sound/soc/imx/imx-pcm-dma-mx2.c +++ b/trunk/sound/soc/imx/imx-pcm-dma-mx2.c @@ -186,16 +186,6 @@ static int snd_imx_pcm_hw_free(struct snd_pcm_substream *substream) return 0; } -static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream) -{ - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct imx_pcm_dma_params *dma_params; - - dma_params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); - - return 0; -} - static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) { struct snd_pcm_runtime *runtime = substream->runtime; @@ -291,7 +281,6 @@ static struct snd_pcm_ops imx_pcm_ops = { .ioctl = snd_pcm_lib_ioctl, .hw_params = snd_imx_pcm_hw_params, .hw_free = snd_imx_pcm_hw_free, - .prepare = snd_imx_pcm_prepare, .trigger = snd_imx_pcm_trigger, .pointer = snd_imx_pcm_pointer, .mmap = snd_imx_pcm_mmap,