ASoC: Intel: Skylake: Properly cleanup on component removal

When we remove component we need to reverse things which were done on
init, this consists of topology cleanup, lists cleanup and releasing
firmware.

Currently cleanup handlers are put in wrong places or otherwise missing.
So add proper component cleanup function and perform cleanups in it.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index c03327ed94a0f90c9a36acde1f2e8504bf831416..75100b44b49a547f4a10f7cc554cfa0a5fd20675 100644 (file)
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -1471,8 +1471,12 @@ static int skl_platform_soc_probe(struct snd_soc_component *component)
 
 static void skl_pcm_remove(struct snd_soc_component *component)
 {
-       /* remove topology */
-       snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL);
+       struct hdac_bus *bus = dev_get_drvdata(component->dev);
+       struct skl *skl = bus_to_skl(bus);
+
+       skl_tplg_exit(component, bus);
+
+       skl_debugfs_exit(skl);
 }
 
 static const struct snd_soc_component_driver skl_component  = {

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 9fd756bcc740a4a4950247a3f51f8942b590ed14..99825dda34af36279ddf0893b1a4d3cc9e111c30 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -3757,3 +3757,18 @@ int skl_tplg_init(struct snd_soc_component *component, struct hdac_bus *bus)
 
        return 0;
 }
+
+void skl_tplg_exit(struct snd_soc_component *component, struct hdac_bus *bus)
+{
+       struct skl *skl = bus_to_skl(bus);
+       struct skl_pipeline *ppl, *tmp;
+
+       if (!list_empty(&skl->ppl_list))
+               list_for_each_entry_safe(ppl, tmp, &skl->ppl_list, node)
+                       list_del(&ppl->node);
+
+       /* clean up topology */
+       snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL);
+
+       release_firmware(skl->tplg);
+}

diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index 9311e248b6f9fcb6e6bc04a44e54fcb57c9435c3..370191a79bc1d5352fcea6d521eb64d5ded6835f 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -471,6 +471,8 @@ void skl_tplg_set_be_dmic_config(struct snd_soc_dai *dai,
        struct skl_pipe_params *params, int stream);
 int skl_tplg_init(struct snd_soc_component *component,
                                struct hdac_bus *ebus);
+void skl_tplg_exit(struct snd_soc_component *component,
+                               struct hdac_bus *bus);
 struct skl_module_cfg *skl_tplg_fe_get_cpr_module(
                struct snd_soc_dai *dai, int stream);
 int skl_tplg_update_pipe_params(struct device *dev,

diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 6d64014102501e6b40d1a48b0eec35c6cae21ccb..e4881ff427ea4e1bb19894de6d9665f8c21a4eaa 100644 (file)
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -1119,14 +1119,12 @@ static void skl_remove(struct pci_dev *pci)
        struct skl *skl = bus_to_skl(bus);
 
        cancel_work_sync(&skl->probe_work);
-       release_firmware(skl->tplg);
 
        pm_runtime_get_noresume(&pci->dev);
 
        /* codec removal, invoke bus_device_remove */
        snd_hdac_ext_bus_device_remove(bus);
 
-       skl->debugfs = NULL;
        skl_platform_unregister(&pci->dev);
        skl_free_dsp(skl);
        skl_machine_device_unregister(skl);