Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/cirrus' and 'asoc...

diff --combined sound/soc/codecs/wm8996.c
index 9304a91b8403d642ebd5e04979fce1e6f0bcb622,69266332760ebad71bed763449afa2f8eb8079a9,69266332760ebad71bed763449afa2f8eb8079a9,622f92565030ff519565be94d99ad7afdae38902..f16ff4f569237828ffa3c140e41815c616da1a8f
--- 1/sound/soc/codecs/wm8996.c
--- 2/sound/soc/codecs/wm8996.c
--- 3/sound/soc/codecs/wm8996.c
--- 4/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@@@@ -620,15 -620,15 -620,15 -620,12 +620,12 @@@@@ static int bg_event(struct snd_soc_dapm
    static int cp_event(struct snd_soc_dapm_widget *w,
                    struct snd_kcontrol *kcontrol, int event)
    {
---     int ret = 0;
--- 
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
                msleep(5);
                break;
        default:
                WARN(1, "Invalid event %d\n", event);
---             ret = -EINVAL;
        }
    
        return 0;
@@@@@ -690,7 -690,8 -690,8 -687,8 +687,7 @@@@@ static void wait_for_dc_servo(struct sn
    static void wm8996_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 wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);
        u16 val, mask;