From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 2 Mar 2012 16:18:30 +0000 (+0000)
Subject: ASoC: core: Split the union for CODEC/platform in the DAI
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2466ab9709bf7375ef8b8ad16f39008ce6e6bc8a;p=linux-beck.git

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

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;