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

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

ASoC: wm8400: 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 83f132c5

sound/soc/codecs/wm8400.c

+5 −4
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ SOC_SINGLE("RIN34 Mute Switch", WM8400_RIGHT_LINE_INPUT_3_4_VOLUME, 
static int outmixer_event (struct snd_soc_dapm_widget *w,

	struct snd_kcontrol * kcontrol, int event)

{

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

	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	u32 reg_shift = mc->shift;
@@ -332,7 +333,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w, 


	switch (reg_shift) {

	case WM8400_SPEAKER_MIXER | (WM8400_LDSPK << 8) :

		reg = snd_soc_read(w->codec, WM8400_OUTPUT_MIXER1);

		reg = snd_soc_read(codec, WM8400_OUTPUT_MIXER1);

		if (reg & WM8400_LDLO) {

			printk(KERN_WARNING

			"Cannot set as Output Mixer 1 LDLO Set\n");
@@ -340,7 +341,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w, 
		}

		break;

	case WM8400_SPEAKER_MIXER | (WM8400_RDSPK << 8):

		reg = snd_soc_read(w->codec, WM8400_OUTPUT_MIXER2);

		reg = snd_soc_read(codec, WM8400_OUTPUT_MIXER2);

		if (reg & WM8400_RDRO) {

			printk(KERN_WARNING

			"Cannot set as Output Mixer 2 RDRO Set\n");
@@ -348,7 +349,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w, 
		}

		break;

	case WM8400_OUTPUT_MIXER1 | (WM8400_LDLO << 8):

		reg = snd_soc_read(w->codec, WM8400_SPEAKER_MIXER);

		reg = snd_soc_read(codec, WM8400_SPEAKER_MIXER);

		if (reg & WM8400_LDSPK) {

			printk(KERN_WARNING

			"Cannot set as Speaker Mixer LDSPK Set\n");
@@ -356,7 +357,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w, 
		}

		break;

	case WM8400_OUTPUT_MIXER2 | (WM8400_RDRO << 8):

		reg = snd_soc_read(w->codec, WM8400_SPEAKER_MIXER);

		reg = snd_soc_read(codec, WM8400_SPEAKER_MIXER);

		if (reg & WM8400_RDSPK) {

			printk(KERN_WARNING

			"Cannot set as Speaker Mixer RDSPK Set\n");