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

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

ASoC: max98090: 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 all other
manual access to codec->dapm with snd_soc_codec_get_dapm().

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

sound/soc/codecs/max98090.c

+9 −8
Original line number Diff line number Diff line
@@ -1500,7 +1500,7 @@ static const struct snd_soc_dapm_route max98091_dapm_routes[] = { 
static int max98090_add_widgets(struct snd_soc_codec *codec)

{

	struct max98090_priv *max98090 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);



	snd_soc_add_codec_controls(codec, max98090_snd_controls,

		ARRAY_SIZE(max98090_snd_controls));
@@ -1798,16 +1798,17 @@ static int max98090_set_bias_level(struct snd_soc_codec *codec, 
		 * away from ON. Disable the clock in that case, otherwise

		 * enable it.

		 */

		if (!IS_ERR(max98090->mclk)) {

			if (codec->dapm.bias_level == SND_SOC_BIAS_ON)

		if (IS_ERR(max98090->mclk))

			break;



		if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_ON)

			clk_disable_unprepare(max98090->mclk);

		else

			clk_prepare_enable(max98090->mclk);

		}

		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 = regcache_sync(max98090->regmap);

			if (ret != 0) {

				dev_err(codec->dev,