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

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

ASoC: wm8{350,753,971}: Use snd_soc_dapm_to_codec() instead of dapm->codec 



The CODEC struct in the snd_soc_dapm_context struct is deprecated and
scheduled for removal. Use the snd_soc_dapm_to_codec() function 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 0634814f

sound/soc/codecs/wm8350.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static void wm8350_pga_work(struct work_struct *work) 
{

	struct snd_soc_dapm_context *dapm =

	    container_of(work, struct snd_soc_dapm_context, delayed_work.work);

	struct snd_soc_codec *codec = dapm->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);

	struct wm8350_data *wm8350_data = snd_soc_codec_get_drvdata(codec);

	struct wm8350_output *out1 = &wm8350_data->out1,

	    *out2 = &wm8350_data->out2;

sound/soc/codecs/wm8753.c

+1 −1
Original line number Diff line number Diff line
@@ -1433,7 +1433,7 @@ static void wm8753_work(struct work_struct *work) 
	struct snd_soc_dapm_context *dapm =

		container_of(work, struct snd_soc_dapm_context,

			     delayed_work.work);

	struct snd_soc_codec *codec = dapm->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);

	wm8753_set_bias_level(codec, dapm->bias_level);

}

sound/soc/codecs/wm8971.c

+1 −1
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static void wm8971_work(struct work_struct *work) 
	struct snd_soc_dapm_context *dapm =

		container_of(work, struct snd_soc_dapm_context,

			     delayed_work.work);

	struct snd_soc_codec *codec = dapm->codec;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(dapm);

	wm8971_set_bias_level(codec, codec->dapm.bias_level);

}