ASoC: core: replace aux_comp_list to component_dev_list
Now, Card has component_dev_list, we can replace aux_comp_list to component_dev_list with new auxiliary flags Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
d9fc40639d
commit
1a653aa447
|
@ -807,9 +807,9 @@ struct snd_soc_component {
|
|||
|
||||
unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */
|
||||
unsigned int registered_as_component:1;
|
||||
unsigned int auxiliary:1; /* for auxiliary component of the card */
|
||||
|
||||
struct list_head list;
|
||||
struct list_head list_aux; /* for auxiliary component of the card */
|
||||
struct list_head card_list;
|
||||
|
||||
struct snd_soc_dai_driver *dai_drv;
|
||||
|
@ -1148,7 +1148,6 @@ struct snd_soc_card {
|
|||
*/
|
||||
struct snd_soc_aux_dev *aux_dev;
|
||||
int num_aux_devs;
|
||||
struct list_head aux_comp_list;
|
||||
|
||||
const struct snd_kcontrol_new *controls;
|
||||
int num_controls;
|
||||
|
@ -1543,7 +1542,6 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
|
|||
INIT_LIST_HEAD(&card->widgets);
|
||||
INIT_LIST_HEAD(&card->paths);
|
||||
INIT_LIST_HEAD(&card->dapm_list);
|
||||
INIT_LIST_HEAD(&card->aux_comp_list);
|
||||
INIT_LIST_HEAD(&card->component_dev_list);
|
||||
}
|
||||
|
||||
|
|
|
@ -1710,7 +1710,8 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
|
|||
}
|
||||
|
||||
component->init = aux_dev->init;
|
||||
list_add(&component->list_aux, &card->aux_comp_list);
|
||||
component->auxiliary = 1;
|
||||
|
||||
return 0;
|
||||
|
||||
err_defer:
|
||||
|
@ -1726,7 +1727,10 @@ static int soc_probe_aux_devices(struct snd_soc_card *card)
|
|||
|
||||
for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
|
||||
order++) {
|
||||
list_for_each_entry(comp, &card->aux_comp_list, list_aux) {
|
||||
list_for_each_entry(comp, &card->component_dev_list, card_list) {
|
||||
if (!comp->auxiliary)
|
||||
continue;
|
||||
|
||||
if (comp->driver->probe_order == order) {
|
||||
ret = soc_probe_component(card, comp);
|
||||
if (ret < 0) {
|
||||
|
@ -1750,11 +1754,14 @@ static void soc_remove_aux_devices(struct snd_soc_card *card)
|
|||
for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
|
||||
order++) {
|
||||
list_for_each_entry_safe(comp, _comp,
|
||||
&card->aux_comp_list, list_aux) {
|
||||
&card->component_dev_list, card_list) {
|
||||
|
||||
if (!comp->auxiliary)
|
||||
continue;
|
||||
|
||||
if (comp->driver->remove_order == order) {
|
||||
soc_remove_component(comp);
|
||||
/* remove it from the card's aux_comp_list */
|
||||
list_del(&comp->list_aux);
|
||||
comp->auxiliary = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue