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

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

ASoC: wm8997: Replace direct snd_soc_codec dapm field access 



The dapm field of the snd_soc_codec struct is eventually going to be
removed, in preparation for this replace all manual access to codec->dapm
with snd_soc_codec_get_dapm().

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 6a141e46

sound/soc/codecs/wm8997.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1055,13 +1055,14 @@ static struct snd_soc_dai_driver wm8997_dai[] = { 




static int wm8997_codec_probe(struct snd_soc_codec *codec)

static int wm8997_codec_probe(struct snd_soc_codec *codec)

{

{

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);





	arizona_init_spk(codec);

	arizona_init_spk(codec);





	snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS");

	snd_soc_dapm_disable_pin(dapm, "HAPTICS");





	priv->core.arizona->dapm = &codec->dapm;

	priv->core.arizona->dapm = dapm;





	return 0;

	return 0;

}

}