diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-09-29 05:40:40 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-09-29 13:25:25 -0400 |
commit | 9cca023e5c5c13486d48d47a46564c359af9ae73 (patch) | |
tree | 0f4496fec3448712e5ade49d1c1627020fd87b6f | |
parent | 0634814fe0f29a46c44386a03f259f99c983bf7e (diff) |
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>
-rw-r--r-- | sound/soc/codecs/wm8350.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm8753.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/wm8971.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 3dfdcc4197fa..628ec774cf22 100644 --- 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) | |||
212 | { | 212 | { |
213 | struct snd_soc_dapm_context *dapm = | 213 | struct snd_soc_dapm_context *dapm = |
214 | container_of(work, struct snd_soc_dapm_context, delayed_work.work); | 214 | container_of(work, struct snd_soc_dapm_context, delayed_work.work); |
215 | struct snd_soc_codec *codec = dapm->codec; | 215 | struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm); |
216 | struct wm8350_data *wm8350_data = snd_soc_codec_get_drvdata(codec); | 216 | struct wm8350_data *wm8350_data = snd_soc_codec_get_drvdata(codec); |
217 | struct wm8350_output *out1 = &wm8350_data->out1, | 217 | struct wm8350_output *out1 = &wm8350_data->out1, |
218 | *out2 = &wm8350_data->out2; | 218 | *out2 = &wm8350_data->out2; |
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index e54e097f4fcb..21ca3a94fc96 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c | |||
@@ -1433,7 +1433,7 @@ static void wm8753_work(struct work_struct *work) | |||
1433 | struct snd_soc_dapm_context *dapm = | 1433 | struct snd_soc_dapm_context *dapm = |
1434 | container_of(work, struct snd_soc_dapm_context, | 1434 | container_of(work, struct snd_soc_dapm_context, |
1435 | delayed_work.work); | 1435 | delayed_work.work); |
1436 | struct snd_soc_codec *codec = dapm->codec; | 1436 | struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm); |
1437 | wm8753_set_bias_level(codec, dapm->bias_level); | 1437 | wm8753_set_bias_level(codec, dapm->bias_level); |
1438 | } | 1438 | } |
1439 | 1439 | ||
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 0499cd4cfb71..39ddb9b8834c 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c | |||
@@ -615,7 +615,7 @@ static void wm8971_work(struct work_struct *work) | |||
615 | struct snd_soc_dapm_context *dapm = | 615 | struct snd_soc_dapm_context *dapm = |
616 | container_of(work, struct snd_soc_dapm_context, | 616 | container_of(work, struct snd_soc_dapm_context, |
617 | delayed_work.work); | 617 | delayed_work.work); |
618 | struct snd_soc_codec *codec = dapm->codec; | 618 | struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm); |
619 | wm8971_set_bias_level(codec, codec->dapm.bias_level); | 619 | wm8971_set_bias_level(codec, codec->dapm.bias_level); |
620 | } | 620 | } |
621 | 621 | ||