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

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

ASoC: wm8961: 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 32a4b446

sound/soc/codecs/wm8961.c

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static bool wm8961_readable(struct device *dev, unsigned int reg) 
static int wm8961_hp_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);

	u16 hp_reg = snd_soc_read(codec, WM8961_ANALOGUE_HP_0);

	u16 cp_reg = snd_soc_read(codec, WM8961_CHARGE_PUMP_1);

	u16 pwr_reg = snd_soc_read(codec, WM8961_PWR_MGMT_2);
@@ -286,7 +286,7 @@ static int wm8961_hp_event(struct snd_soc_dapm_widget *w, 
static int wm8961_spk_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);

	u16 pwr_reg = snd_soc_read(codec, WM8961_PWR_MGMT_2);

	u16 spk_reg = snd_soc_read(codec, WM8961_CLASS_D_CONTROL_1);