ASoC: Add indirection for CODEC private data

One of the features of the multi CODEC work is that it embeds a struct
device in the CODEC to provide diagnostics via a sysfs class rather than
via the device tree, at which point it's much better to use the struct
device private data rather than having two places to store it. Provide
an accessor function to allow this change to be made more easily, and
update all the CODEC drivers are updated.

To ensure use of the accessor the private data structure member is
renamed, meaning that if code developed with older an older core that
still uses private_data is merged it will fail to build.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>

1 files changed, 7 insertions, 6 deletions

diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c
index ceb86b4ddb25..d2244c93f581 100644
--- a/sound/soc/codecs/wm9713.c
+++ b/sound/soc/codecs/wm9713.c
@@ -763,7 +763,7 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int source)
 static int wm9713_set_pll(struct snd_soc_codec *codec,
         int pll_id, unsigned int freq_in, unsigned int freq_out)
 {
-        struct wm9713_priv *wm9713 = codec->private_data;
+        struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec);
         u16 reg, reg2;
         struct _pll_div pll_div;
 
@@ -1174,7 +1174,7 @@ static int wm9713_soc_resume(struct platform_device *pdev)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
         struct snd_soc_codec *codec = socdev->card->codec;
-        struct wm9713_priv *wm9713 = codec->private_data;
+        struct wm9713_priv *wm9713 = snd_soc_codec_get_drvdata(codec);
         int i, ret;
         u16 *cache = codec->reg_cache;
 
@@ -1227,8 +1227,9 @@ static int wm9713_soc_probe(struct platform_device *pdev)
         codec->reg_cache_size = sizeof(wm9713_reg);
         codec->reg_cache_step = 2;
 
-        codec->private_data = kzalloc(sizeof(struct wm9713_priv), GFP_KERNEL);
-        if (codec->private_data == NULL) {
+        snd_soc_codec_set_drvdata(codec, kzalloc(sizeof(struct wm9713_priv),
+                                                 GFP_KERNEL));
+        if (snd_soc_codec_get_drvdata(codec) == NULL) {
                 ret = -ENOMEM;
                 goto priv_err;
         }
@@ -1279,7 +1280,7 @@ pcm_err:
         snd_soc_free_ac97_codec(codec);
 
 codec_err:
-        kfree(codec->private_data);
+        kfree(snd_soc_codec_get_drvdata(codec));
 
 priv_err:
         kfree(codec->reg_cache);
@@ -1301,7 +1302,7 @@ static int wm9713_soc_remove(struct platform_device *pdev)
         snd_soc_dapm_free(socdev);
         snd_soc_free_pcms(socdev);
         snd_soc_free_ac97_codec(codec);
-        kfree(codec->private_data);
+        kfree(snd_soc_codec_get_drvdata(codec));
         kfree(codec->reg_cache);
         kfree(codec);
         return 0;