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

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

ASoC: cs42l52: 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 avatarBrian Austin <brian.austin@cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 02aa78ab

sound/soc/codecs/cs42l52.c

+2 −2
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ static int cs42l52_set_bias_level(struct snd_soc_codec *codec, 
				    CS42L52_PWRCTL1_PDN_CODEC, 0);

		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) {

			regcache_cache_only(cs42l52->regmap, false);

			regcache_sync(cs42l52->regmap);

		}
@@ -955,7 +955,7 @@ static void cs42l52_beep_work(struct work_struct *work) 
	struct cs42l52_private *cs42l52 =

		container_of(work, struct cs42l52_private, beep_work);

	struct snd_soc_codec *codec = cs42l52->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	int i;

	int val = 0;

	int best = 0;