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>

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;