From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
soc-core has some API which is used from topology, but it is doing
topology specific operation at soc-core.
soc-core should care about core things, and topology should care
about topology things, otherwise, it is very confusable.
For example topology type is not related to soc-core,
it is topology side issue.
This patch removes meaningless check from soc-core.
This patch keeps extra initialization/destruction at
snd_soc_add_dai_link() / snd_soc_remove_dai_link()
which were for topology.
>From this patch, non-topology card can use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
sound/soc/soc-core.c | 28 ++++------------------------
1 file changed, 4 insertions(+), 24 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 8be78d5..1cf8d09 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1439,19 +1439,12 @@ int snd_soc_add_dai_link(struct snd_soc_card *card,
{
int ret;
- if (dai_link->dobj.type
- && dai_link->dobj.type != SND_SOC_DOBJ_DAI_LINK) {
- dev_err(card->dev, "Invalid dai link type %d\n",
- dai_link->dobj.type);
- return -EINVAL;
- }
-
lockdep_assert_held(&client_mutex);
+
/*
* Notify the machine driver for extra initialization
- * on the link created by topology.
*/
- if (dai_link->dobj.type && card->add_dai_link)
+ if (card->add_dai_link)
card->add_dai_link(card, dai_link);
ret = soc_bind_dai_link(card, dai_link);
@@ -1478,19 +1471,12 @@ EXPORT_SYMBOL_GPL(snd_soc_add_dai_link);
void snd_soc_remove_dai_link(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_link)
{
- if (dai_link->dobj.type
- && dai_link->dobj.type != SND_SOC_DOBJ_DAI_LINK) {
- dev_err(card->dev, "Invalid dai link type %d\n",
- dai_link->dobj.type);
- return;
- }
-
lockdep_assert_held(&client_mutex);
+
/*
* Notify the machine driver for extra destruction
- * on the link created by topology.
*/
- if (dai_link->dobj.type && card->remove_dai_link)
+ if (card->remove_dai_link)
card->remove_dai_link(card, dai_link);
list_del(&dai_link->list);
@@ -2613,12 +2599,6 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
struct device *dev = component->dev;
struct snd_soc_dai *dai;
- if (dai_drv->dobj.type &&
- dai_drv->dobj.type != SND_SOC_DOBJ_PCM) {
- dev_err(dev, "Invalid dai type %d\n", dai_drv->dobj.type);
- return NULL;
- }
-
dev_dbg(dev, "ASoC: dai register %s\n", dai_drv->name);
lockdep_assert_held(&client_mutex);
--
2.7.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
