redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: Use card field to indicate whether a component is bound 

Use the card field of a component to indicate whether it is bound or not.
This makes a certain sense given that the field contains the card the
component is bound to and a component can only be bound to one card at a
time. And it also requires to unset the card field when the component is
unbound from the card.

This makes the probded flag redundant and it can be removed.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
hifive-unleashed-5.1
Lars-Peter Clausen 2015-07-08 20:47:44 +02:00 committed by Mark Brown
parent 1b7c123169
commit abd31b32dd
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc.h
View File

@ -758,7 +758,6 @@ struct snd_soc_component {
unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */
unsigned int registered_as_component:1;
unsigned int probed:1;
struct list_head list;

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

@ -978,7 +978,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num)
static void soc_remove_component(struct snd_soc_component *component)
{
if (!component->probed)
if (!component->card)
return;
/* This is a HACK and will be removed soon */
@ -991,7 +991,7 @@ static void soc_remove_component(struct snd_soc_component *component)
snd_soc_dapm_free(snd_soc_component_get_dapm(component));
soc_cleanup_component_debugfs(component);
component->probed = 0;
component->card = NULL;
module_put(component->dev->driver->owner);
}
@ -1105,7 +1105,7 @@ static int soc_probe_component(struct snd_soc_card *card,
if (!strcmp(component->name, "snd-soc-dummy"))
return 0;
if (component->probed) {
if (component->card) {
if (component->card != card) {
dev_err(component->dev,
"Trying to bind component to card \"%s\" but is already bound to card \"%s\"\n",
@ -1115,13 +1115,13 @@ static int soc_probe_component(struct snd_soc_card *card,
return 0;
}
if (!try_module_get(component->dev->driver->owner))
return -ENODEV;
component->card = card;
dapm->card = card;
soc_set_name_prefix(card, component);
if (!try_module_get(component->dev->driver->owner))
return -ENODEV;
soc_init_component_debugfs(component);
if (component->dapm_widgets) {
@ -1165,7 +1165,6 @@ static int soc_probe_component(struct snd_soc_card *card,
snd_soc_dapm_add_routes(dapm, component->dapm_routes,
component->num_dapm_routes);
component->probed = 1;
list_add(&dapm->list, &card->dapm_list);
/* This is a HACK and will be removed soon */
@ -1176,6 +1175,7 @@ static int soc_probe_component(struct snd_soc_card *card,
err_probe:
soc_cleanup_component_debugfs(component);
component->card = NULL;
module_put(component->dev->driver->owner);
return ret;
@ -1459,7 +1459,7 @@ static void soc_remove_aux_dev(struct snd_soc_card *card, int num)
rtd->dev_registered = 0;
}
if (component && component->probed)
if (component)
soc_remove_component(component);
}