3 files changed, 24 insertions, 40 deletions

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 37d95a898275..cadc7fc5d727 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -397,6 +397,7 @@ int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm,
                             const struct snd_soc_dapm_route *route, int num);
 int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm,
                              const struct snd_soc_dapm_route *route, int num);
+void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w);
 
 /* dapm events */
 void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index e0de8072c514..24ea692bd49e 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2312,30 +2312,36 @@ static void dapm_free_path(struct snd_soc_dapm_path *path)
         kfree(path);
 }
 
+void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w)
+{
+        struct snd_soc_dapm_path *p, *next_p;
+
+        list_del(&w->list);
+        /*
+         * remove source and sink paths associated to this widget.
+         * While removing the path, remove reference to it from both
+         * source and sink widgets so that path is removed only once.
+         */
+        list_for_each_entry_safe(p, next_p, &w->sources, list_sink)
+                dapm_free_path(p);
+
+        list_for_each_entry_safe(p, next_p, &w->sinks, list_source)
+                dapm_free_path(p);
+
+        kfree(w->kcontrols);
+        kfree(w->name);
+        kfree(w);
+}
+
 /* free all dapm widgets and resources */
 static void dapm_free_widgets(struct snd_soc_dapm_context *dapm)
 {
         struct snd_soc_dapm_widget *w, *next_w;
-        struct snd_soc_dapm_path *p, *next_p;
 
         list_for_each_entry_safe(w, next_w, &dapm->card->widgets, list) {
                 if (w->dapm != dapm)
                         continue;
-                list_del(&w->list);
-                /*
-                 * remove source and sink paths associated to this widget.
-                 * While removing the path, remove reference to it from both
-                 * source and sink widgets so that path is removed only once.
-                 */
-                list_for_each_entry_safe(p, next_p, &w->sources, list_sink)
-                        dapm_free_path(p);
-
-                list_for_each_entry_safe(p, next_p, &w->sinks, list_source)
-                        dapm_free_path(p);
-
-                kfree(w->kcontrols);
-                kfree(w->name);
-                kfree(w);
+                snd_soc_dapm_free_widget(w);
         }
 }
 
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index d0960683c409..56dd108d6f5f 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1734,7 +1734,6 @@ void snd_soc_tplg_widget_remove_all(struct snd_soc_dapm_context *dapm,
         u32 index)
 {
         struct snd_soc_dapm_widget *w, *next_w;
-        struct snd_soc_dapm_path *p, *next_p;
 
         list_for_each_entry_safe(w, next_w, &dapm->card->widgets, list) {
 
@@ -1746,31 +1745,9 @@ void snd_soc_tplg_widget_remove_all(struct snd_soc_dapm_context *dapm,
                 if (w->dobj.index != index &&
                         w->dobj.index != SND_SOC_TPLG_INDEX_ALL)
                         continue;
-
-                list_del(&w->list);
-
-                /*
-                 * remove source and sink paths associated to this widget.
-                 * While removing the path, remove reference to it from both
-                 * source and sink widgets so that path is removed only once.
-                 */
-                list_for_each_entry_safe(p, next_p, &w->sources, list_sink) {
-                        list_del(&p->list_sink);
-                        list_del(&p->list_source);
-                        list_del(&p->list);
-                        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);
-                }
                 /* check and free and dynamic widget kcontrols */
                 snd_soc_tplg_widget_remove(w);
-                kfree(w->kcontrols);
-                kfree(w->name);
-                kfree(w);
+                snd_soc_dapm_free_widget(w);
         }
 }
 EXPORT_SYMBOL_GPL(snd_soc_tplg_widget_remove_all);