ASoC: core: Split the union for CODEC/platform in the DAI
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 2 Mar 2012 16:18:30 +0000 (16:18 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 4 Mar 2012 13:44:01 +0000 (13:44 +0000)
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>
include/sound/soc-dai.h

index adb07fcd712c162351a576c5a229fa3ebef438af..c429f248cf4e995a6a8aa20eaa1ec8af71ddfe74 100644 (file)
@@ -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;