diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-03-22 09:12:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 10:15:16 -0400 |
commit | 8c4e56fd5595105128077c2bbdfde3c15a4c2d91 (patch) | |
tree | 9094fc0e35dd93fdde24ed3cf4f358142fd10be0 /sound/soc/ux500 | |
parent | 3021bd38ed31380df5e270451162feca83aef40f (diff) |
ASoC: ux500_pcm: No need to wrap snd_dmaengine_pcm_close()
If a PCM driver using the dmaengine PCM helper functions doesn't need to do
anything special in its pcm_close callback, snd_dmaengine_pcm_close can be used
directly for as the pcm_close callback and there is no need to wrap it in a
custom function.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Ola Lilja <ola.o.lilja@stericsson.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/ux500')
-rw-r--r-- | sound/soc/ux500/ux500_pcm.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c index 375ca6ba3ebb..d000ba271cab 100644 --- a/sound/soc/ux500/ux500_pcm.c +++ b/sound/soc/ux500/ux500_pcm.c | |||
@@ -160,18 +160,6 @@ static int ux500_pcm_open(struct snd_pcm_substream *substream) | |||
160 | return 0; | 160 | return 0; |
161 | } | 161 | } |
162 | 162 | ||
163 | static int ux500_pcm_close(struct snd_pcm_substream *substream) | ||
164 | { | ||
165 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | ||
166 | struct snd_soc_dai *dai = rtd->cpu_dai; | ||
167 | |||
168 | dev_dbg(dai->dev, "%s: Enter\n", __func__); | ||
169 | |||
170 | snd_dmaengine_pcm_close(substream); | ||
171 | |||
172 | return 0; | ||
173 | } | ||
174 | |||
175 | static int ux500_pcm_hw_params(struct snd_pcm_substream *substream, | 163 | static int ux500_pcm_hw_params(struct snd_pcm_substream *substream, |
176 | struct snd_pcm_hw_params *hw_params) | 164 | struct snd_pcm_hw_params *hw_params) |
177 | { | 165 | { |
@@ -246,7 +234,7 @@ static int ux500_pcm_mmap(struct snd_pcm_substream *substream, | |||
246 | 234 | ||
247 | static struct snd_pcm_ops ux500_pcm_ops = { | 235 | static struct snd_pcm_ops ux500_pcm_ops = { |
248 | .open = ux500_pcm_open, | 236 | .open = ux500_pcm_open, |
249 | .close = ux500_pcm_close, | 237 | .close = snd_dmaengine_pcm_close, |
250 | .ioctl = snd_pcm_lib_ioctl, | 238 | .ioctl = snd_pcm_lib_ioctl, |
251 | .hw_params = ux500_pcm_hw_params, | 239 | .hw_params = ux500_pcm_hw_params, |
252 | .hw_free = ux500_pcm_hw_free, | 240 | .hw_free = ux500_pcm_hw_free, |