From: Mark Brown <broonie@linaro.org>
Date: Mon, 4 Aug 2014 15:31:29 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/cirrus' and 'asoc... 
X-Git-Tag: v3.17-rc1~101^2~5^2~10
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/62e951ea6516ce7fd1a98da0438dbdbfe25a1567?hp=-c

Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/cirrus' and 'asoc/topic/cleanup' into asoc-next
---

62e951ea6516ce7fd1a98da0438dbdbfe25a1567
diff --combined sound/soc/codecs/wm8996.c
index 9304a91b8403,69266332760e,69266332760e,622f92565030..f16ff4f56923
--- a/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;