ASoC: wm8{350,753,971}: Use snd_soc_dapm_to_codec() instead of dapm->codec

The CODEC struct in the snd_soc_dapm_context struct is deprecated and
scheduled for removal. Use the snd_soc_dapm_to_codec() function instead.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index 3dfdcc4197fa96cce56a13e50291b9075e44d4a9..628ec774cf2296c56c7851fe773cacca3568b53f 100644 (file)
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -212,7 +212,7 @@ static void wm8350_pga_work(struct work_struct *work)
 {
        struct snd_soc_dapm_context *dapm =
            container_of(work, struct snd_soc_dapm_context, delayed_work.work);
-       struct snd_soc_codec *codec = dapm->codec;
+       struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
        struct wm8350_data *wm8350_data = snd_soc_codec_get_drvdata(codec);
        struct wm8350_output *out1 = &wm8350_data->out1,
            *out2 = &wm8350_data->out2;

diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index e54e097f4fcbb738870a6c51e9c0970f21e18ade..21ca3a94fc96eadabbc42cfcfdbf8b7eeefb5472 100644 (file)
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1433,7 +1433,7 @@ static void wm8753_work(struct work_struct *work)
        struct snd_soc_dapm_context *dapm =
                container_of(work, struct snd_soc_dapm_context,
                             delayed_work.work);
-       struct snd_soc_codec *codec = dapm->codec;
+       struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
        wm8753_set_bias_level(codec, dapm->bias_level);
 }
 

diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index 0499cd4cfb71266e478fa5269abe8469b42e5d01..39ddb9b8834ccbf19a996605019eb8e74b4dddcf 100644 (file)
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -615,7 +615,7 @@ static void wm8971_work(struct work_struct *work)
        struct snd_soc_dapm_context *dapm =
                container_of(work, struct snd_soc_dapm_context,
                             delayed_work.work);
-       struct snd_soc_codec *codec = dapm->codec;
+       struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
        wm8971_set_bias_level(codec, codec->dapm.bias_level);
 }