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>

1 files changed, 8 insertions, 7 deletions

diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c
index d5c81bb3decb..2e9e06b2daaf 100644
--- a/sound/soc/codecs/wm9705.c
+++ b/sound/soc/codecs/wm9705.c
@@ -249,7 +249,7 @@ static int ac97_prepare(struct snd_pcm_substream *substream,
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         int reg;
         u16 vra;
 
@@ -323,10 +323,11 @@ static int wm9705_soc_probe(struct platform_device *pdev)
 
         printk(KERN_INFO "WM9705 SoC Audio Codec\n");
 
-        socdev->codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
-        if (socdev->codec == NULL)
+        socdev->card->codec = kzalloc(sizeof(struct snd_soc_codec),
+                                      GFP_KERNEL);
+        if (socdev->card->codec == NULL)
                 return -ENOMEM;
-        codec = socdev->codec;
+        codec = socdev->card->codec;
         mutex_init(&codec->mutex);
 
         codec->reg_cache = kmemdup(wm9705_reg, sizeof(wm9705_reg), GFP_KERNEL);
@@ -380,15 +381,15 @@ pcm_err:
 codec_err:
         kfree(codec->reg_cache);
 cache_err:
-        kfree(socdev->codec);
-        socdev->codec = NULL;
+        kfree(socdev->card->codec);
+        socdev->card->codec = NULL;
         return ret;
 }
 
 static int wm9705_soc_remove(struct platform_device *pdev)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
 
         if (codec == NULL)
                 return 0;