Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 13:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: dapm: Add a helper function to free a DAPM path

Browse Source 
We have the same code for freeing a DAPM path in three different locations.
Introduce a new helper function to take care of this.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Lars-Peter Clausen 2013-06-14 13:16:53 +02:00 committed by Mark Brown
parent 58fee775b7
commit 8872293fc3
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sound/soc/soc-dapm.c
View File

@ -2105,6 +2105,15 @@ static void snd_soc_dapm_sys_remove(struct device *dev)
device_remove_file(dev, &dev_attr_dapm_widget); device_remove_file(dev, &dev_attr_dapm_widget);
} }
static void dapm_free_path(struct snd_soc_dapm_path *path)
{
list_del(&path->list_sink);
list_del(&path->list_source);
list_del(&path->list);
kfree(path->long_name);
kfree(path);
}
/* free all dapm widgets and resources */ /* free all dapm widgets and resources */
static void dapm_free_widgets(struct snd_soc_dapm_context *dapm) static void dapm_free_widgets(struct snd_soc_dapm_context *dapm)
{ {
@ -2120,20 +2129,12 @@ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm)
* While removing the path, remove reference to it from both * While removing the path, remove reference to it from both
* source and sink widgets so that path is removed only once. * source and sink widgets so that path is removed only once.
*/ */
list_for_each_entry_safe(p, next_p, &w->sources, list_sink) { list_for_each_entry_safe(p, next_p, &w->sources, list_sink)
list_del(&p->list_sink); dapm_free_path(p);
list_del(&p->list_source);
list_del(&p->list); list_for_each_entry_safe(p, next_p, &w->sinks, list_source)
kfree(p->long_name); dapm_free_path(p);
kfree(p);
}
list_for_each_entry_safe(p, next_p, &w->sinks, list_source) {
list_del(&p->list_sink);
list_del(&p->list_source);
list_del(&p->list);
kfree(p->long_name);
kfree(p);
}
kfree(w->kcontrols); kfree(w->kcontrols);
kfree(w->name); kfree(w->name);
kfree(w); kfree(w);
@ -2408,10 +2409,7 @@ static int snd_soc_dapm_del_route(struct snd_soc_dapm_context *dapm,
dapm_mark_dirty(path->source, "Route removed"); dapm_mark_dirty(path->source, "Route removed");
dapm_mark_dirty(path->sink, "Route removed"); dapm_mark_dirty(path->sink, "Route removed");
list_del(&path->list); dapm_free_path(path);
list_del(&path->list_sink);
list_del(&path->list_source);
kfree(path);
} else { } else {
dev_warn(dapm->dev, "ASoC: Route %s->%s does not exist\n", dev_warn(dapm->dev, "ASoC: Route %s->%s does not exist\n",
source, sink); source, sink);