aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm5100.c
diff options
context:
space:
mode:
authorGravatar Lars-Peter Clausen <lars@metafoo.de> 2015-01-13 10:27:09 +0100
committerGravatar Mark Brown <broonie@kernel.org> 2015-01-14 19:52:48 +0000
commit3196048ee6543e53d32b848660284a8d0ef09fbf (patch)
tree308433907a5a5ca06cd6d831d233b5062aad1112 /sound/soc/codecs/wm5100.c
parentASoC: wm2000: Replace w->codec snd_soc_dapm_to_codec(w->dapm) (diff)
downloadlinux-3196048ee6543e53d32b848660284a8d0ef09fbf.tar.gz
linux-3196048ee6543e53d32b848660284a8d0ef09fbf.tar.bz2
linux-3196048ee6543e53d32b848660284a8d0ef09fbf.zip
ASoC: wm5102: Replace w->codec snd_soc_dapm_to_codec(w->dapm)
The codec field of the snd_soc_widget struct is eventually going to be removed, use snd_soc_dapm_to_codec(w->dapm) 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>
Diffstat (limited to 'sound/soc/codecs/wm5100.c')
-rw-r--r--sound/soc/codecs/wm5100.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index b80970dc2d2f..ea09db585aa1 100644
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -775,7 +775,8 @@ static int wm5100_out_ev(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol,
int event)
{
- struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(w->codec);
+ struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
+ struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec);
switch (w->reg) {
case WM5100_CHANNEL_ENABLES_1:
@@ -839,7 +840,7 @@ static int wm5100_post_ev(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol,
int event)
{
- struct snd_soc_codec *codec = w->codec;
+ struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec);
int ret;