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

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

ASoC: wm8995: 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.bias_level with snd_soc_codec_get_bias_level() and replace all
other 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 8e09bac7

sound/soc/codecs/wm8995.c

+3 −2
Original line number Diff line number Diff line
@@ -721,6 +721,7 @@ static int configure_aif_clock(struct snd_soc_codec *codec, int aif) 


static int configure_clock(struct snd_soc_codec *codec)

{

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct wm8995_priv *wm8995;

	int change, new;
@@ -751,7 +752,7 @@ static int configure_clock(struct snd_soc_codec *codec) 
	if (!change)

		return 0;



	snd_soc_dapm_sync(&codec->dapm);

	snd_soc_dapm_sync(dapm);



	return 0;

}
@@ -1965,7 +1966,7 @@ static int wm8995_set_bias_level(struct snd_soc_codec *codec, 
	case SND_SOC_BIAS_PREPARE:

		break;

	case SND_SOC_BIAS_STANDBY:

		if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {

		if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {

			ret = regulator_bulk_enable(ARRAY_SIZE(wm8995->supplies),

						    wm8995->supplies);

			if (ret)