ASoC: soc-core: rename snd_soc_remove_dai_link() to snd_soc_remove_pcm_runtime()

Now soc-core and soc-topology is using snd_soc_remove_dai_link().
It removes pcm_runtime (= rtd) and disconnect it from card.
The purpose is removing pcm_runtime, not dai_link.
This patch renames function name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/875zipyq5s.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index b223b2d39950e1879ee648460fb0638aeb3a2c28..3923178ad0506216211158c6e55cc1588528b0ef 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1325,8 +1325,8 @@ void snd_soc_of_put_dai_link_codecs(struct snd_soc_dai_link *dai_link);
 
 int snd_soc_add_pcm_runtime(struct snd_soc_card *card,
                            struct snd_soc_dai_link *dai_link);
-void snd_soc_remove_dai_link(struct snd_soc_card *card,
-                            struct snd_soc_dai_link *dai_link);
+void snd_soc_remove_pcm_runtime(struct snd_soc_card *card,
+                               struct snd_soc_pcm_runtime *rtd);
 
 struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
                                         struct snd_soc_dai_driver *dai_drv,

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index af9da991d99e08597afafc664286b155b9fe511b..f82d521306b707965c2677766951c930dccc8e51 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -998,33 +998,26 @@ static int soc_dai_link_sanity_check(struct snd_soc_card *card,
 }
 
 /**
- * snd_soc_remove_dai_link - Remove a DAI link from the list
- * @card: The ASoC card that owns the link
- * @dai_link: The DAI link to remove
+ * snd_soc_remove_pcm_runtime - Remove a pcm_runtime from card
+ * @card: The ASoC card to which the pcm_runtime has
+ * @rtd: The pcm_runtime to remove
  *
- * This function removes a DAI link from the ASoC card's link list.
- *
- * For DAI links previously added by topology, topology should
- * remove them by using the dobj embedded in the link.
+ * This function removes a pcm_runtime from the ASoC card.
  */
-void snd_soc_remove_dai_link(struct snd_soc_card *card,
-                            struct snd_soc_dai_link *dai_link)
+void snd_soc_remove_pcm_runtime(struct snd_soc_card *card,
+                               struct snd_soc_pcm_runtime *rtd)
 {
-       struct snd_soc_pcm_runtime *rtd;
-
        lockdep_assert_held(&client_mutex);
 
        /*
         * Notify the machine driver for extra destruction
         */
        if (card->remove_dai_link)
-               card->remove_dai_link(card, dai_link);
+               card->remove_dai_link(card, rtd->dai_link);
 
-       rtd = snd_soc_get_pcm_runtime(card, dai_link);
-       if (rtd)
-               soc_free_pcm_runtime(rtd);
+       soc_free_pcm_runtime(rtd);
 }
-EXPORT_SYMBOL_GPL(snd_soc_remove_dai_link);
+EXPORT_SYMBOL_GPL(snd_soc_remove_pcm_runtime);
 
 /**
  * snd_soc_add_pcm_runtime - Add a pcm_runtime dynamically via dai_link
@@ -1104,7 +1097,7 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card,
        return 0;
 
 _err_defer:
-       soc_free_pcm_runtime(rtd);
+       snd_soc_remove_pcm_runtime(card, rtd);
        return -EPROBE_DEFER;
 }
 EXPORT_SYMBOL_GPL(snd_soc_add_pcm_runtime);
@@ -1871,7 +1864,7 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card,
        soc_remove_link_components(card);
 
        for_each_card_rtds_safe(card, rtd, n)
-               snd_soc_remove_dai_link(card, rtd->dai_link);
+               snd_soc_remove_pcm_runtime(card, rtd);
 
        /* remove auxiliary devices */
        soc_remove_aux_devices(card);

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index de427881a2ae566bfbc4685e5f6028b1ddf54aec..e9b660f3116f27d549e4b1d9621bfa1c66fc6b29 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -553,7 +553,9 @@ static void remove_link(struct snd_soc_component *comp,
        kfree(link->cpus->dai_name);
 
        list_del(&dobj->list);
-       snd_soc_remove_dai_link(comp->card, link);
+
+       snd_soc_remove_pcm_runtime(comp->card,
+                       snd_soc_get_pcm_runtime(comp->card, link));
        kfree(link);
 }