summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown2009-05-05 11:27:38 +0200
committerMark Brown2009-05-05 11:27:38 +0200
commitbbd993077d788589a86a718ba7a7895ba5e71a17 (patch)
treee7616850c96bea0169aa1f37314c5554f1cda281
parentMerge branch 'for-2.6.30' into for-2.6.31 (diff)
downloadkernel-qcow2-linux-bbd993077d788589a86a718ba7a7895ba5e71a17.tar.gz
kernel-qcow2-linux-bbd993077d788589a86a718ba7a7895ba5e71a17.tar.xz
kernel-qcow2-linux-bbd993077d788589a86a718ba7a7895ba5e71a17.zip
ASoC: Remove redundant codec pointer from DAIs
The DAI structure has two pointers to the codec, one in the body of the DAI and one in a union for a parent pointer. Drop the parent pointer version. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--include/sound/soc-dai.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index a997c2cac63f..496dc30457b7 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -205,11 +205,8 @@ struct snd_soc_dai {
/* DAI private data */
void *private_data;
- /* parent codec/platform */
- union {
- struct snd_soc_codec *codec;
- struct snd_soc_platform *platform;
- };
+ /* parent platform */
+ struct snd_soc_platform *platform;
struct list_head list;
};