Merge remote-tracking branch 'asoc/topic/core' into asoc-next (d872f046) · Commits · 戴 / test

include/sound/soc.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -812,7 +812,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 auxiliary:1; /* for auxiliary component of the card */
		unsigned int suspended:1; /* is in suspend PM state */

		struct list_head list;

+6 −11

Original line number	Diff line number	Diff line
		@@ -1776,7 +1776,6 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
		}

		component->init = aux_dev->init;
		component->auxiliary = 1;
		list_add(&component->card_aux_list, &card->aux_comp_list);

		return 0;
		@@ -1788,14 +1787,13 @@ err_defer:

		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 ret;

		for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST;
		order++) {
		list_for_each_entry_safe(comp, tmp, &card->aux_comp_list,
		card_aux_list) {
		list_for_each_entry(comp, &card->aux_comp_list, card_aux_list) {
		if (comp->driver->probe_order == order) {
		ret = soc_probe_component(card, comp);
		if (ret < 0) {
		@@ -1804,7 +1802,6 @@ static int soc_probe_aux_devices(struct snd_soc_card *card)
		comp->name, 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;
		order++) {
		list_for_each_entry_safe(comp, _comp,
		&card->component_dev_list, card_list) {

		if (!comp->auxiliary)
		continue;
		&card->aux_comp_list, card_aux_list) {

		if (comp->driver->remove_order == order) {
		soc_remove_component(comp);
		comp->auxiliary = 0;
		/* remove it from the card's aux_comp_list */
		list_del(&comp->card_aux_list);
		}
		}
		}