ASoC: audio-graph: move audio_graph_remove() to simple-card-utils.c

audio-graph-card2 can reuse  audio_graph_remove() / asoc_simple_remove().
This patch moves it to simple-card-utils.c.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87y2df3uby.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/graph_card.h b/include/sound/graph_card.h
index 9c2feb7927429b828dd27c51d6feaa7234351a7c..6f10bfb0d5ee07b33002681591495821cebc53c1 100644 (file)
--- a/include/sound/graph_card.h
+++ b/include/sound/graph_card.h
@@ -11,6 +11,4 @@
 
 int audio_graph_parse_of(struct asoc_simple_priv *priv, struct device *dev);
 
-int audio_graph_remove(struct platform_device *pdev);
-
 #endif /* __GRAPH_CARD_H */

diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index 656c7e30b6e4916642ade73db9c3a3289dc1829b..51b3b485a92ec427e049285e3b6d697546c36599 100644 (file)
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -177,10 +177,10 @@ int asoc_simple_init_jack(struct snd_soc_card *card,
                               int is_hp, char *prefix, char *pin);
 int asoc_simple_init_priv(struct asoc_simple_priv *priv,
                               struct link_info *li);
+int asoc_simple_remove(struct platform_device *pdev);
 
 int asoc_graph_card_probe(struct snd_soc_card *card);
 
-
 #ifdef DEBUG
 static inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv,
                                         char *name,

diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c
index 6cac167a4e2b932ea5fe70daaeccdc2fbbdcd092..976c1ea31a9884d268f603ab9210bd68c050e2cd 100644 (file)
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@ -743,14 +743,6 @@ static int graph_probe(struct platform_device *pdev)
        return audio_graph_parse_of(priv, dev);
 }
 
-int audio_graph_remove(struct platform_device *pdev)
-{
-       struct snd_soc_card *card = platform_get_drvdata(pdev);
-
-       return asoc_simple_clean_reference(card);
-}
-EXPORT_SYMBOL_GPL(audio_graph_remove);
-
 static const struct of_device_id graph_of_match[] = {
        { .compatible = "audio-graph-card", },
        { .compatible = "audio-graph-scu-card",
@@ -766,7 +758,7 @@ static struct platform_driver graph_card = {
                .of_match_table = graph_of_match,
        },
        .probe = graph_probe,
-       .remove = audio_graph_remove,
+       .remove = asoc_simple_remove,
 };
 module_platform_driver(graph_card);
 

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index ed2cad6d9ac1345083b2591b44d9442e7367e159..fa1247f0dda1ec68003a5f718b61e1075bb7ea01 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -740,6 +740,14 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
 }
 EXPORT_SYMBOL_GPL(asoc_simple_init_priv);
 
+int asoc_simple_remove(struct platform_device *pdev)
+{
+       struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+       return asoc_simple_clean_reference(card);
+}
+EXPORT_SYMBOL_GPL(asoc_simple_remove);
+
 int asoc_graph_card_probe(struct snd_soc_card *card)
 {
        struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(card);

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index ca27cb9ff9e17e6ccc26658a97c61a33872a8645..a1373be4558f3f40faf84a37b4b69d6249737453 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -708,13 +708,6 @@ err:
        return ret;
 }
 
-static int asoc_simple_remove(struct platform_device *pdev)
-{
-       struct snd_soc_card *card = platform_get_drvdata(pdev);
-
-       return asoc_simple_clean_reference(card);
-}
-
 static const struct of_device_id simple_of_match[] = {
        { .compatible = "simple-audio-card", },
        { .compatible = "simple-scu-audio-card",

diff --git a/sound/soc/tegra/tegra_audio_graph_card.c b/sound/soc/tegra/tegra_audio_graph_card.c
index 35d008b5d373f9cb1fda26cc941b4bc39b9cec66..1f2c5018bf5aceded1267d64d5974dc8e3495ec5 100644 (file)
--- a/sound/soc/tegra/tegra_audio_graph_card.c
+++ b/sound/soc/tegra/tegra_audio_graph_card.c
@@ -244,7 +244,7 @@ static struct platform_driver tegra_audio_graph_card = {
                .of_match_table = graph_of_tegra_match,
        },
        .probe = tegra_audio_graph_probe,
-       .remove = audio_graph_remove,
+       .remove = asoc_simple_remove,
 };
 module_platform_driver(tegra_audio_graph_card);