Date:2013-03-22 14:12:09 (11 years 6 days ago)
Author:Lars C.
Commit:3437fafdc8b049001ece5e629160cd3d7ba5b8e9
Message:ASoC: atmel-pcm-dma: Do not use snd_dmaengine_pcm_{set,get}_data()

We want to get rid of snd_dmaengine_pcm_{set,get}_data(). All instances of
snd_dmaengine_pcm_get_data() in the atmel pcm driver can easily be replaced with
snd_soc_dai_get_dma_data().

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Tested-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Files: sound/soc/atmel/atmel-pcm-dma.c (4 diffs)

Change Details

sound/soc/atmel/atmel-pcm-dma.c
6767static void atmel_pcm_dma_irq(u32 ssc_sr,
6868    struct snd_pcm_substream *substream)
6969{
70    struct snd_soc_pcm_runtime *rtd = substream->private_data;
7071    struct atmel_pcm_dma_params *prtd;
7172
72    prtd = snd_dmaengine_pcm_get_data(substream);
73    prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
7374
7475    if (ssc_sr & prtd->mask->ssc_error) {
7576        if (snd_pcm_running(substream))
...... 
104105}
105106
106107static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream,
107    struct snd_pcm_hw_params *params)
108    struct snd_pcm_hw_params *params, struct atmel_pcm_dma_params *prtd)
108109{
109    struct atmel_pcm_dma_params *prtd;
110110    struct ssc_device *ssc;
111111    struct dma_chan *dma_chan;
112112    struct dma_slave_config slave_config;
113113    int ret;
114114
115    prtd = snd_dmaengine_pcm_get_data(substream);
116115    ssc = prtd->ssc;
117116
118117    ret = snd_hwparams_to_dma_slave_config(substream, params,
...... 
164163        return -EINVAL;
165164    }
166165
167    snd_dmaengine_pcm_set_data(substream, prtd);
168
169    ret = atmel_pcm_configure_dma(substream, params);
166    ret = atmel_pcm_configure_dma(substream, params, prtd);
170167    if (ret) {
171168        pr_err("atmel-pcm: failed to configure dmai\n");
172169        goto err;
...... 
182179
183180static int atmel_pcm_dma_prepare(struct snd_pcm_substream *substream)
184181{
182    struct snd_soc_pcm_runtime *rtd = substream->private_data;
185183    struct atmel_pcm_dma_params *prtd;
186184
187    prtd = snd_dmaengine_pcm_get_data(substream);
185    prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
188186
189187    ssc_writex(prtd->ssc->regs, SSC_IER, prtd->mask->ssc_error);
190188    ssc_writex(prtd->ssc->regs, SSC_CR, prtd->mask->ssc_enable);

Archive Download the corresponding diff file



interactive