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

ASoC: sgtl5000: Replace w->codec snd_soc_dapm_to_codec(w->dapm) 



The codec field of the snd_soc_widget struct is eventually going to be
removed, use snd_soc_dapm_to_codec(w->dapm) instead.

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

sound/soc/codecs/sgtl5000.c

+8 −6
Original line number Diff line number Diff line
@@ -155,18 +155,19 @@ struct sgtl5000_priv { 
static int mic_bias_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{

	struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(w->codec);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec);



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		/* change mic bias resistor */

		snd_soc_update_bits(w->codec, SGTL5000_CHIP_MIC_CTRL,

		snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL,

			SGTL5000_BIAS_R_MASK,

			sgtl5000->micbias_resistor << SGTL5000_BIAS_R_SHIFT);

		break;



	case SND_SOC_DAPM_PRE_PMD:

		snd_soc_update_bits(w->codec, SGTL5000_CHIP_MIC_CTRL,

		snd_soc_update_bits(codec, SGTL5000_CHIP_MIC_CTRL,

				SGTL5000_BIAS_R_MASK, 0);

		break;

	}
@@ -181,11 +182,12 @@ static int mic_bias_event(struct snd_soc_dapm_widget *w, 
static int power_vag_event(struct snd_soc_dapm_widget *w,

	struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	const u32 mask = SGTL5000_DAC_POWERUP | SGTL5000_ADC_POWERUP;



	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER,

		snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,

			SGTL5000_VAG_POWERUP, SGTL5000_VAG_POWERUP);

		break;
@@ -195,9 +197,9 @@ static int power_vag_event(struct snd_soc_dapm_widget *w, 
		 * operational to prevent inadvertently starving the

		 * other one of them.

		 */

		if ((snd_soc_read(w->codec, SGTL5000_CHIP_ANA_POWER) &

		if ((snd_soc_read(codec, SGTL5000_CHIP_ANA_POWER) &

				mask) != mask) {

			snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER,

			snd_soc_update_bits(codec, SGTL5000_CHIP_ANA_POWER,

				SGTL5000_VAG_POWERUP, 0);

			msleep(400);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE