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 | ||
---|---|---|
67 | 67 | static void atmel_pcm_dma_irq(u32 ssc_sr, |
68 | 68 | struct snd_pcm_substream *substream) |
69 | 69 | { |
70 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | |
70 | 71 | struct atmel_pcm_dma_params *prtd; |
71 | 72 | |
72 | prtd = snd_dmaengine_pcm_get_data(substream); | |
73 | prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); | |
73 | 74 | |
74 | 75 | if (ssc_sr & prtd->mask->ssc_error) { |
75 | 76 | if (snd_pcm_running(substream)) |
... | ... | |
104 | 105 | } |
105 | 106 | |
106 | 107 | static 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) | |
108 | 109 | { |
109 | struct atmel_pcm_dma_params *prtd; | |
110 | 110 | struct ssc_device *ssc; |
111 | 111 | struct dma_chan *dma_chan; |
112 | 112 | struct dma_slave_config slave_config; |
113 | 113 | int ret; |
114 | 114 | |
115 | prtd = snd_dmaengine_pcm_get_data(substream); | |
116 | 115 | ssc = prtd->ssc; |
117 | 116 | |
118 | 117 | ret = snd_hwparams_to_dma_slave_config(substream, params, |
... | ... | |
164 | 163 | return -EINVAL; |
165 | 164 | } |
166 | 165 | |
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); | |
170 | 167 | if (ret) { |
171 | 168 | pr_err("atmel-pcm: failed to configure dmai\n"); |
172 | 169 | goto err; |
... | ... | |
182 | 179 | |
183 | 180 | static int atmel_pcm_dma_prepare(struct snd_pcm_substream *substream) |
184 | 181 | { |
182 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | |
185 | 183 | struct atmel_pcm_dma_params *prtd; |
186 | 184 | |
187 | prtd = snd_dmaengine_pcm_get_data(substream); | |
185 | prtd = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); | |
188 | 186 | |
189 | 187 | ssc_writex(prtd->ssc->regs, SSC_IER, prtd->mask->ssc_error); |
190 | 188 | ssc_writex(prtd->ssc->regs, SSC_CR, prtd->mask->ssc_enable); |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9