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

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

ASoC: cx20442: 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().

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6d701b6d

sound/soc/codecs/cx20442.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -333,7 +333,7 @@ static int cx20442_set_bias_level(struct snd_soc_codec *codec, 




	switch (level) {

	switch (level) {

	case SND_SOC_BIAS_PREPARE:

	case SND_SOC_BIAS_PREPARE:

		if (codec->dapm.bias_level != SND_SOC_BIAS_STANDBY)

		if (snd_soc_codec_get_bias_level(codec) != SND_SOC_BIAS_STANDBY)

			break;

			break;

		if (IS_ERR(cx20442->por))

		if (IS_ERR(cx20442->por))

			err = PTR_ERR(cx20442->por);

			err = PTR_ERR(cx20442->por);
@@ -341,7 +341,7 @@ static int cx20442_set_bias_level(struct snd_soc_codec *codec, 
			err = regulator_enable(cx20442->por);

			err = regulator_enable(cx20442->por);

		break;

		break;

	case SND_SOC_BIAS_STANDBY:

	case SND_SOC_BIAS_STANDBY:

		if (codec->dapm.bias_level != SND_SOC_BIAS_PREPARE)

		if (snd_soc_codec_get_bias_level(codec) != SND_SOC_BIAS_PREPARE)

			break;

			break;

		if (IS_ERR(cx20442->por))

		if (IS_ERR(cx20442->por))

			err = PTR_ERR(cx20442->por);

			err = PTR_ERR(cx20442->por);