Commit 8686f251 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown

ASoC: intel: 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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b93673be
...@@ -320,11 +320,6 @@ static struct snd_pcm_ops sst_byt_pcm_ops = { ...@@ -320,11 +320,6 @@ static struct snd_pcm_ops sst_byt_pcm_ops = {
.mmap = sst_byt_pcm_mmap, .mmap = sst_byt_pcm_mmap,
}; };
static void sst_byt_pcm_free(struct snd_pcm *pcm)
{
snd_pcm_lib_preallocate_free_for_all(pcm);
}
static int sst_byt_pcm_new(struct snd_soc_pcm_runtime *rtd) static int sst_byt_pcm_new(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_pcm *pcm = rtd->pcm; struct snd_pcm *pcm = rtd->pcm;
...@@ -403,7 +398,6 @@ static struct snd_soc_platform_driver byt_soc_platform = { ...@@ -403,7 +398,6 @@ static struct snd_soc_platform_driver byt_soc_platform = {
.remove = sst_byt_pcm_remove, .remove = sst_byt_pcm_remove,
.ops = &sst_byt_pcm_ops, .ops = &sst_byt_pcm_ops,
.pcm_new = sst_byt_pcm_new, .pcm_new = sst_byt_pcm_new,
.pcm_free = sst_byt_pcm_free,
}; };
static const struct snd_soc_component_driver byt_dai_component = { static const struct snd_soc_component_driver byt_dai_component = {
......
...@@ -735,11 +735,6 @@ static void hsw_pcm_free_modules(struct hsw_priv_data *pdata) ...@@ -735,11 +735,6 @@ static void hsw_pcm_free_modules(struct hsw_priv_data *pdata)
} }
} }
static void hsw_pcm_free(struct snd_pcm *pcm)
{
snd_pcm_lib_preallocate_free_for_all(pcm);
}
static int hsw_pcm_new(struct snd_soc_pcm_runtime *rtd) static int hsw_pcm_new(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_pcm *pcm = rtd->pcm; struct snd_pcm *pcm = rtd->pcm;
...@@ -936,7 +931,6 @@ static struct snd_soc_platform_driver hsw_soc_platform = { ...@@ -936,7 +931,6 @@ static struct snd_soc_platform_driver hsw_soc_platform = {
.remove = hsw_pcm_remove, .remove = hsw_pcm_remove,
.ops = &hsw_pcm_ops, .ops = &hsw_pcm_ops,
.pcm_new = hsw_pcm_new, .pcm_new = hsw_pcm_new,
.pcm_free = hsw_pcm_free,
}; };
static const struct snd_soc_component_driver hsw_dai_component = { static const struct snd_soc_component_driver hsw_dai_component = {
......
...@@ -643,12 +643,6 @@ static struct snd_pcm_ops sst_platform_ops = { ...@@ -643,12 +643,6 @@ static struct snd_pcm_ops sst_platform_ops = {
.pointer = sst_platform_pcm_pointer, .pointer = sst_platform_pcm_pointer,
}; };
static void sst_pcm_free(struct snd_pcm *pcm)
{
dev_dbg(pcm->dev, "sst_pcm_free called\n");
snd_pcm_lib_preallocate_free_for_all(pcm);
}
static int sst_pcm_new(struct snd_soc_pcm_runtime *rtd) static int sst_pcm_new(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_dai *dai = rtd->cpu_dai; struct snd_soc_dai *dai = rtd->cpu_dai;
...@@ -679,7 +673,6 @@ static struct snd_soc_platform_driver sst_soc_platform_drv = { ...@@ -679,7 +673,6 @@ static struct snd_soc_platform_driver sst_soc_platform_drv = {
.ops = &sst_platform_ops, .ops = &sst_platform_ops,
.compr_ops = &sst_platform_compr_ops, .compr_ops = &sst_platform_compr_ops,
.pcm_new = sst_pcm_new, .pcm_new = sst_pcm_new,
.pcm_free = sst_pcm_free,
}; };
static const struct snd_soc_component_driver sst_component = { static const struct snd_soc_component_driver sst_component = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment