aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/soc.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-23 17:55:23 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-01-27 05:30:54 -0500
commit6627a653bceb3a54e55e5cdc478ec5b8d5c9cc44 (patch)
tree9a6f157ad1123e4f047689bbf3c4ef88ec1259a4 /include/sound/soc.h
parent0db4d0705260dd4bddf1e5a5441c58bdf08bdc9f (diff)
ASoC: Push the codec runtime storage into the card structure
This is a further stage on the road to refactoring away the ASoC platform device. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r--include/sound/soc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 7039343e8a78..0e7735264169 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -418,6 +418,8 @@ struct snd_soc_card {
418 418
419 struct snd_soc_device *socdev; 419 struct snd_soc_device *socdev;
420 420
421 struct snd_soc_codec *codec;
422
421 struct snd_soc_platform *platform; 423 struct snd_soc_platform *platform;
422 struct delayed_work delayed_work; 424 struct delayed_work delayed_work;
423 struct work_struct deferred_resume_work; 425 struct work_struct deferred_resume_work;
@@ -427,7 +429,6 @@ struct snd_soc_card {
427struct snd_soc_device { 429struct snd_soc_device {
428 struct device *dev; 430 struct device *dev;
429 struct snd_soc_card *card; 431 struct snd_soc_card *card;
430 struct snd_soc_codec *codec;
431 struct snd_soc_codec_device *codec_dev; 432 struct snd_soc_codec_device *codec_dev;
432 void *codec_data; 433 void *codec_data;
433}; 434};