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

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

ASoC: rt5670: 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>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent eb13bd56

sound/soc/codecs/rt5670.c

+13 −12
Original line number Original line Diff line number Diff line
@@ -416,12 +416,12 @@ static bool rt5670_readable_register(struct device *dev, unsigned int reg) 
static int rt5670_headset_detect(struct snd_soc_codec *codec, int jack_insert)

static int rt5670_headset_detect(struct snd_soc_codec *codec, int jack_insert)

{

{

	int val;

	int val;

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);

	struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);





	if (jack_insert) {

	if (jack_insert) {

		snd_soc_dapm_force_enable_pin(&codec->dapm,

		snd_soc_dapm_force_enable_pin(dapm, "Mic Det Power");

						       "Mic Det Power");

		snd_soc_dapm_sync(dapm);

		snd_soc_dapm_sync(&codec->dapm);

		snd_soc_update_bits(codec, RT5670_GEN_CTRL3, 0x4, 0x0);

		snd_soc_update_bits(codec, RT5670_GEN_CTRL3, 0x4, 0x0);

		snd_soc_update_bits(codec, RT5670_CJ_CTRL2,

		snd_soc_update_bits(codec, RT5670_CJ_CTRL2,

			RT5670_CBJ_DET_MODE | RT5670_CBJ_MN_JD,

			RT5670_CBJ_DET_MODE | RT5670_CBJ_MN_JD,
@@ -447,15 +447,15 @@ static int rt5670_headset_detect(struct snd_soc_codec *codec, int jack_insert) 
		} else {

		} else {

			snd_soc_update_bits(codec, RT5670_GEN_CTRL3, 0x4, 0x4);

			snd_soc_update_bits(codec, RT5670_GEN_CTRL3, 0x4, 0x4);

			rt5670->jack_type = SND_JACK_HEADPHONE;

			rt5670->jack_type = SND_JACK_HEADPHONE;

			snd_soc_dapm_disable_pin(&codec->dapm, "Mic Det Power");

			snd_soc_dapm_disable_pin(dapm, "Mic Det Power");

			snd_soc_dapm_sync(&codec->dapm);

			snd_soc_dapm_sync(dapm);

		}

		}

	} else {

	} else {

		snd_soc_update_bits(codec, RT5670_INT_IRQ_ST, 0x8, 0x0);

		snd_soc_update_bits(codec, RT5670_INT_IRQ_ST, 0x8, 0x0);

		snd_soc_update_bits(codec, RT5670_GEN_CTRL3, 0x4, 0x4);

		snd_soc_update_bits(codec, RT5670_GEN_CTRL3, 0x4, 0x4);

		rt5670->jack_type = 0;

		rt5670->jack_type = 0;

		snd_soc_dapm_disable_pin(&codec->dapm, "Mic Det Power");

		snd_soc_dapm_disable_pin(dapm, "Mic Det Power");

		snd_soc_dapm_sync(&codec->dapm);

		snd_soc_dapm_sync(dapm);

	}

	}





	return rt5670->jack_type;

	return rt5670->jack_type;
@@ -2603,7 +2603,7 @@ static int rt5670_set_bias_level(struct snd_soc_codec *codec, 




	switch (level) {

	switch (level) {

	case SND_SOC_BIAS_PREPARE:

	case SND_SOC_BIAS_PREPARE:

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

		if (SND_SOC_BIAS_STANDBY == snd_soc_codec_get_bias_level(codec)) {

			snd_soc_update_bits(codec, RT5670_PWR_ANLG1,

			snd_soc_update_bits(codec, RT5670_PWR_ANLG1,

				RT5670_PWR_VREF1 | RT5670_PWR_MB |

				RT5670_PWR_VREF1 | RT5670_PWR_MB |

				RT5670_PWR_BG | RT5670_PWR_VREF2,

				RT5670_PWR_BG | RT5670_PWR_VREF2,
@@ -2653,23 +2653,24 @@ static int rt5670_set_bias_level(struct snd_soc_codec *codec, 




static int rt5670_probe(struct snd_soc_codec *codec)

static int rt5670_probe(struct snd_soc_codec *codec)

{

{

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);

	struct rt5670_priv *rt5670 = snd_soc_codec_get_drvdata(codec);





	switch (snd_soc_read(codec, RT5670_RESET) & RT5670_ID_MASK) {

	switch (snd_soc_read(codec, RT5670_RESET) & RT5670_ID_MASK) {

	case RT5670_ID_5670:

	case RT5670_ID_5670:

	case RT5670_ID_5671:

	case RT5670_ID_5671:

		snd_soc_dapm_new_controls(&codec->dapm,

		snd_soc_dapm_new_controls(dapm,

			rt5670_specific_dapm_widgets,

			rt5670_specific_dapm_widgets,

			ARRAY_SIZE(rt5670_specific_dapm_widgets));

			ARRAY_SIZE(rt5670_specific_dapm_widgets));

		snd_soc_dapm_add_routes(&codec->dapm,

		snd_soc_dapm_add_routes(dapm,

			rt5670_specific_dapm_routes,

			rt5670_specific_dapm_routes,

			ARRAY_SIZE(rt5670_specific_dapm_routes));

			ARRAY_SIZE(rt5670_specific_dapm_routes));

		break;

		break;

	case RT5670_ID_5672:

	case RT5670_ID_5672:

		snd_soc_dapm_new_controls(&codec->dapm,

		snd_soc_dapm_new_controls(dapm,

			rt5672_specific_dapm_widgets,

			rt5672_specific_dapm_widgets,

			ARRAY_SIZE(rt5672_specific_dapm_widgets));

			ARRAY_SIZE(rt5672_specific_dapm_widgets));

		snd_soc_dapm_add_routes(&codec->dapm,

		snd_soc_dapm_add_routes(dapm,

			rt5672_specific_dapm_routes,

			rt5672_specific_dapm_routes,

			ARRAY_SIZE(rt5672_specific_dapm_routes));

			ARRAY_SIZE(rt5672_specific_dapm_routes));

		break;

		break;