aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/soc.h
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-11-30 06:22:55 +0000
committerMark Brown <broonie@kernel.org>2016-12-01 20:09:50 +0000
commit1a653aa44725668590b36bbe2d7fe4736a69f055 (patch)
treea4e928493b9f33906e9a9516664843e15e47ac7a /include/sound/soc.h
parentASoC: core: replace codec_dev_list to component_dev_list on Card (diff)
downloadlinux-dev-1a653aa44725668590b36bbe2d7fe4736a69f055.tar.xz
linux-dev-1a653aa44725668590b36bbe2d7fe4736a69f055.zip
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>
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r--include/sound/soc.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index b5544e2287b8..0bd57b77d010 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -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);
}