summaryrefslogtreecommitdiffstats
path: root/include/sound/soc-dai.h
diff options
context:
space:
mode:
authorMark Brown2012-03-02 17:18:30 +0100
committerMark Brown2012-03-04 14:44:01 +0100
commit2466ab9709bf7375ef8b8ad16f39008ce6e6bc8a (patch)
tree48043fbd677ef7ab9145885af373d292e375ef18 /include/sound/soc-dai.h
parentASoC: sgtl5000: rename device tree binding document (diff)
downloadkernel-qcow2-linux-2466ab9709bf7375ef8b8ad16f39008ce6e6bc8a.tar.gz
kernel-qcow2-linux-2466ab9709bf7375ef8b8ad16f39008ce6e6bc8a.tar.xz
kernel-qcow2-linux-2466ab9709bf7375ef8b8ad16f39008ce6e6bc8a.zip
ASoC: core: Split the union for CODEC/platform in the DAI
There's now core code which falls back to global CODEC operations for DAI calls that needs to be able to tell if it's dealing with a CPU or CODEC DAI and given the small number of DAIs in a typical system and overall memory usage pattern saving a pointer per DAI is really not worth the effort. Reported-by: Ian Lartey <ian@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'include/sound/soc-dai.h')
-rw-r--r--include/sound/soc-dai.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index adb07fcd712c..c429f248cf4e 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -250,10 +250,9 @@ struct snd_soc_dai {
unsigned int rate;
/* parent platform/codec */
- union {
- struct snd_soc_platform *platform;
- struct snd_soc_codec *codec;
- };
+ struct snd_soc_platform *platform;
+ struct snd_soc_codec *codec;
+
struct snd_soc_card *card;
struct list_head list;