p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ASoC: soc-core: remove topology specific operation 

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@renesas.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87pni6251h.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-11-05 15:47:22 +09:00 committed by Mark Brown
parent 71cb85f5e9
commit 237d19080c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sound/soc/soc-core.c
View File

@ -1436,19 +1436,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);
@ -1475,19 +1468,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);
@ -2609,12 +2595,6 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component,
{
struct device *dev = component->dev;
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);