diff options
| author | Mark Brown <broonie@kernel.org> | 2021-04-20 21:30:50 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-04-20 21:30:50 +0300 |
| commit | 23b16df6c9c91f70df070be43c5b13ef4016c1e7 (patch) | |
| tree | 34c8fd174c76f3c918ba7edcd08604ae33236ea9 /include | |
| parent | 7342db3cddcd1d8ff54f4dff8c942e04232f1d6d (diff) | |
| parent | 63f2f9cceb09f8e5f668e36c1cf764eea468ebed (diff) | |
| download | linux-23b16df6c9c91f70df070be43c5b13ef4016c1e7.tar.xz | |
Merge series "ASoC: audio-graph: cleanups" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:
Hi Mark
These patches cleanups audio-graph.
This is part of prepare for new audio-graph-card2.
Kuninori Morimoto (6):
ASoC: audio-graph: move audio_graph_card_probe() to simple-card-utils.c
ASoC: audio-graph: move audio_graph_remove() to simple-card-utils.c
ASoC: audio-graph: check ports if exists
ASoC: audio-graph: remove "audio-graph-card," preix support
ASoC: audio-graph: remove unused "node" from graph_parse_mclk_fs()
ASoC: audio-graph: remove Platform support
include/sound/graph_card.h | 4 --
include/sound/simple_card_utils.h | 3 ++
sound/soc/generic/audio-graph-card.c | 52 ++++--------------------
sound/soc/generic/simple-card-utils.c | 25 ++++++++++++
sound/soc/generic/simple-card.c | 7 ----
sound/soc/tegra/tegra_audio_graph_card.c | 4 +-
6 files changed, 38 insertions(+), 57 deletions(-)
--
2.25.1
Thank you for your help !!
Best regards
---
Kuninori Morimoto
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/graph_card.h | 4 | ||||
| -rw-r--r-- | include/sound/simple_card_utils.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/sound/graph_card.h b/include/sound/graph_card.h index 013784467bec..6f10bfb0d5ee 100644 --- a/include/sound/graph_card.h +++ b/include/sound/graph_card.h @@ -9,10 +9,6 @@ #include <sound/simple_card_utils.h> -int audio_graph_card_probe(struct snd_soc_card *card); - 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 e318a2d4ac44..51b3b485a92e 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -177,6 +177,9 @@ 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, |