diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-02 07:56:08 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-05 16:28:37 -0500 |
commit | 12e29a075d4c0c9767261068cdcbfa4b346a451b (patch) | |
tree | 9a0c48f905562e24a67d35870ec5a15c4579ed7e /sound/soc/au1x | |
parent | 97bf6af1f928216fd6c5a66e8a57bfa95a659672 (diff) |
ASoC: au1x: Remove unnecessary snd_pcm_lib_preallocate_free_for_all()
The ALSA core takes care that all preallocated memory is freed when the PCM
itself is freed. There is no need to do this manually in the driver.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/au1x')
-rw-r--r-- | sound/soc/au1x/dbdma2.c | 6 | ||||
-rw-r--r-- | sound/soc/au1x/dma.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c index b06b8d8128c6..dd94fea72d5d 100644 --- a/sound/soc/au1x/dbdma2.c +++ b/sound/soc/au1x/dbdma2.c | |||
@@ -315,11 +315,6 @@ static struct snd_pcm_ops au1xpsc_pcm_ops = { | |||
315 | .pointer = au1xpsc_pcm_pointer, | 315 | .pointer = au1xpsc_pcm_pointer, |
316 | }; | 316 | }; |
317 | 317 | ||
318 | static void au1xpsc_pcm_free_dma_buffers(struct snd_pcm *pcm) | ||
319 | { | ||
320 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
321 | } | ||
322 | |||
323 | static int au1xpsc_pcm_new(struct snd_soc_pcm_runtime *rtd) | 318 | static int au1xpsc_pcm_new(struct snd_soc_pcm_runtime *rtd) |
324 | { | 319 | { |
325 | struct snd_card *card = rtd->card->snd_card; | 320 | struct snd_card *card = rtd->card->snd_card; |
@@ -335,7 +330,6 @@ static int au1xpsc_pcm_new(struct snd_soc_pcm_runtime *rtd) | |||
335 | static struct snd_soc_platform_driver au1xpsc_soc_platform = { | 330 | static struct snd_soc_platform_driver au1xpsc_soc_platform = { |
336 | .ops = &au1xpsc_pcm_ops, | 331 | .ops = &au1xpsc_pcm_ops, |
337 | .pcm_new = au1xpsc_pcm_new, | 332 | .pcm_new = au1xpsc_pcm_new, |
338 | .pcm_free = au1xpsc_pcm_free_dma_buffers, | ||
339 | }; | 333 | }; |
340 | 334 | ||
341 | static int au1xpsc_pcm_drvprobe(struct platform_device *pdev) | 335 | static int au1xpsc_pcm_drvprobe(struct platform_device *pdev) |
diff --git a/sound/soc/au1x/dma.c b/sound/soc/au1x/dma.c index 6ffaaff469c7..24cc7f40d87a 100644 --- a/sound/soc/au1x/dma.c +++ b/sound/soc/au1x/dma.c | |||
@@ -287,11 +287,6 @@ static struct snd_pcm_ops alchemy_pcm_ops = { | |||
287 | .pointer = alchemy_pcm_pointer, | 287 | .pointer = alchemy_pcm_pointer, |
288 | }; | 288 | }; |
289 | 289 | ||
290 | static void alchemy_pcm_free_dma_buffers(struct snd_pcm *pcm) | ||
291 | { | ||
292 | snd_pcm_lib_preallocate_free_for_all(pcm); | ||
293 | } | ||
294 | |||
295 | static int alchemy_pcm_new(struct snd_soc_pcm_runtime *rtd) | 290 | static int alchemy_pcm_new(struct snd_soc_pcm_runtime *rtd) |
296 | { | 291 | { |
297 | struct snd_pcm *pcm = rtd->pcm; | 292 | struct snd_pcm *pcm = rtd->pcm; |
@@ -305,7 +300,6 @@ static int alchemy_pcm_new(struct snd_soc_pcm_runtime *rtd) | |||
305 | static struct snd_soc_platform_driver alchemy_pcm_soc_platform = { | 300 | static struct snd_soc_platform_driver alchemy_pcm_soc_platform = { |
306 | .ops = &alchemy_pcm_ops, | 301 | .ops = &alchemy_pcm_ops, |
307 | .pcm_new = alchemy_pcm_new, | 302 | .pcm_new = alchemy_pcm_new, |
308 | .pcm_free = alchemy_pcm_free_dma_buffers, | ||
309 | }; | 303 | }; |
310 | 304 | ||
311 | static int alchemy_pcm_drvprobe(struct platform_device *pdev) | 305 | static int alchemy_pcm_drvprobe(struct platform_device *pdev) |