diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-02 15:08:03 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-02 15:16:23 +0000 |
| commit | 6308419a199eed66086cd756ab8dc81b88d54a6b (patch) | |
| tree | eb192c630862769a803729b2c366a69f9184e38e /include/sound/soc.h | |
| parent | 0ecfe7987855d21c2a89ffe003ddf0ee11b42d47 (diff) | |
| download | blackbird-op-linux-6308419a199eed66086cd756ab8dc81b88d54a6b.tar.gz blackbird-op-linux-6308419a199eed66086cd756ab8dc81b88d54a6b.zip | |
ASoC: Push workqueue data into snd_soc_card
ASoC v2 does not use the struct snd_soc_device at runtime, using struct
snd_soc_card as the root of the card. Begin removing data from
snd_soc_device by pushing the workqueue data into snd_soc_card, using a
backpointer to the snd_soc_device to keep things going for the time
being.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 9356c1ce98c1..359ec49f8d0d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -349,6 +349,11 @@ struct snd_soc_card { /* CPU <--> Codec DAI links */ struct snd_soc_dai_link *dai_link; int num_links; + + struct snd_soc_device *socdev; + + struct delayed_work delayed_work; + struct work_struct deferred_resume_work; }; /* SoC Device - the audio subsystem */ @@ -358,8 +363,6 @@ struct snd_soc_device { struct snd_soc_platform *platform; struct snd_soc_codec *codec; struct snd_soc_codec_device *codec_dev; - struct delayed_work delayed_work; - struct work_struct deferred_resume_work; void *codec_data; #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_root; |
