leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/core' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2017-04-30 22:15:40 +09:00
commit d872f04606
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc.h
View File

@ -812,7 +812,6 @@ struct snd_soc_component {
unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */ unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */
unsigned int registered_as_component:1; unsigned int registered_as_component:1;
unsigned int auxiliary:1; /* for auxiliary component of the card */
unsigned int suspended:1; /* is in suspend PM state */ unsigned int suspended:1; /* is in suspend PM state */
struct list_head list; struct list_head list;

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

@ -1776,7 +1776,6 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
} }
component->init = aux_dev->init; component->init = aux_dev->init;
component->auxiliary = 1;
list_add(&component->card_aux_list, &card->aux_comp_list); list_add(&component->card_aux_list, &card->aux_comp_list);
return 0; return 0;
@ -1788,14 +1787,13 @@ err_defer:
static int soc_probe_aux_devices(struct snd_soc_card *card) static int soc_probe_aux_devices(struct snd_soc_card *card)
{ {
struct snd_soc_component *comp, *tmp; struct snd_soc_component *comp;
int order; int order;
int ret; int ret;
for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
order++) { order++) {
list_for_each_entry_safe(comp, tmp, &card->aux_comp_list, list_for_each_entry(comp, &card->aux_comp_list, card_aux_list) {
card_aux_list) {
if (comp->driver->probe_order == order) { if (comp->driver->probe_order == order) {
ret = soc_probe_component(card, comp); ret = soc_probe_component(card, comp);
if (ret < 0) { if (ret < 0) {
@ -1804,7 +1802,6 @@ static int soc_probe_aux_devices(struct snd_soc_card *card)
comp->name, ret); comp->name, ret);
return ret; return ret;
} }
list_del(&comp->card_aux_list);
} }
} }
} }
@ -1820,14 +1817,12 @@ static void soc_remove_aux_devices(struct snd_soc_card *card)
for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
order++) { order++) {
list_for_each_entry_safe(comp, _comp, list_for_each_entry_safe(comp, _comp,
&card->component_dev_list, card_list) { &card->aux_comp_list, card_aux_list) {
if (!comp->auxiliary)
continue;
if (comp->driver->remove_order == order) { if (comp->driver->remove_order == order) {
soc_remove_component(comp); soc_remove_component(comp);
comp->auxiliary = 0; /* remove it from the card's aux_comp_list */
list_del(&comp->card_aux_list);
} }
} }
} }
@ -3139,7 +3134,7 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
component->suspend = component->driver->suspend; component->suspend = component->driver->suspend;
component->resume = component->driver->resume; component->resume = component->driver->resume;
component->pcm_new = component->driver->pcm_new; component->pcm_new = component->driver->pcm_new;
component->pcm_free= component->driver->pcm_free; component->pcm_free = component->driver->pcm_free;
dapm = &component->dapm; dapm = &component->dapm;
dapm->dev = dev; dapm->dev = dev;