Commit 043123fd authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: arizona: 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>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 278a2026

sound/soc/codecs/arizona.c

+10 −8
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static int arizona_spk_ev(struct snd_soc_dapm_widget *w, 
			  struct snd_kcontrol *kcontrol,

			  int event)

{

	struct snd_soc_codec *codec = w->codec;

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

	struct arizona *arizona = dev_get_drvdata(codec->dev->parent);

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	bool manual_ena = false;
@@ -692,7 +692,8 @@ static void arizona_in_set_vu(struct snd_soc_codec *codec, int ena) 
int arizona_in_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol,

		  int event)

{

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(w->codec);

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

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	unsigned int reg;



	if (w->shift % 2)
@@ -705,25 +706,25 @@ int arizona_in_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, 
		priv->in_pending++;

		break;

	case SND_SOC_DAPM_POST_PMU:

		snd_soc_update_bits(w->codec, reg, ARIZONA_IN1L_MUTE, 0);

		snd_soc_update_bits(codec, reg, ARIZONA_IN1L_MUTE, 0);



		/* If this is the last input pending then allow VU */

		priv->in_pending--;

		if (priv->in_pending == 0) {

			msleep(1);

			arizona_in_set_vu(w->codec, 1);

			arizona_in_set_vu(codec, 1);

		}

		break;

	case SND_SOC_DAPM_PRE_PMD:

		snd_soc_update_bits(w->codec, reg,

		snd_soc_update_bits(codec, reg,

				    ARIZONA_IN1L_MUTE | ARIZONA_IN_VU,

				    ARIZONA_IN1L_MUTE | ARIZONA_IN_VU);

		break;

	case SND_SOC_DAPM_POST_PMD:

		/* Disable volume updates if no inputs are enabled */

		reg = snd_soc_read(w->codec, ARIZONA_INPUT_ENABLES);

		reg = snd_soc_read(codec, ARIZONA_INPUT_ENABLES);

		if (reg == 0)

			arizona_in_set_vu(w->codec, 0);

			arizona_in_set_vu(codec, 0);

	}



	return 0;
@@ -760,7 +761,8 @@ int arizona_hp_ev(struct snd_soc_dapm_widget *w, 
		   struct snd_kcontrol *kcontrol,

		   int event)

{

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(w->codec);

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

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->arizona;

	unsigned int mask = 1 << w->shift;

	unsigned int val;

CRA Git | Maintained and supported by SUSTech CRA and CCSE