Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00748490 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: wm8996: 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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9887adf1

sound/soc/codecs/wm8996.c

+5 −3
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static void wm8996_bg_disable(struct snd_soc_codec *codec) 
static int bg_event(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);

	int ret = 0;



	switch (event) {
@@ -634,7 +634,8 @@ static int cp_event(struct snd_soc_dapm_widget *w, 
static int rmv_short_event(struct snd_soc_dapm_widget *w,

			   struct snd_kcontrol *kcontrol, int event)

{

	struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(w->codec);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);



	/* Record which outputs we enabled */

	switch (event) {
@@ -758,7 +759,8 @@ static void wm8996_seq_notifier(struct snd_soc_dapm_context *dapm, 
static int dcs_start(struct snd_soc_dapm_widget *w,

		     struct snd_kcontrol *kcontrol, int event)

{

	struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(w->codec);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec);



	switch (event) {

	case SND_SOC_DAPM_POST_PMU: