Merge remote-tracking branches 'asoc/topic/adau1977', 'asoc/topic/ak4642', 'asoc...

[sfrench/cifs-2.6.git] / sound / soc / codecs / wm5100.c

diff --git a/sound/soc/codecs/wm5100.c b/sound/soc/codecs/wm5100.c
index 91a9ea2a205679e451ab4ddf9258404a54322a2a..7bb0d36d4c5485b703d2e7cd0adede1e732446b0 100644 (file)
--- a/sound/soc/codecs/wm5100.c
+++ b/sound/soc/codecs/wm5100.c
@@ -735,8 +735,7 @@ WM5100_MIXER_CONTROLS("LHPF4", WM5100_HPLP4MIX_INPUT_1_SOURCE),
 static void wm5100_seq_notifier(struct snd_soc_dapm_context *dapm,
                                enum snd_soc_dapm_type event, int subseq)
 {
-       struct snd_soc_codec *codec = container_of(dapm,
-                                                  struct snd_soc_codec, dapm);
+       struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);
        struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec);
        u16 val, expect, i;