Commit 9e3f9f36 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: arizona: Add new common Arizona init function 



Currently the driver has quite a few small initialisation functions, in
preparation for some refactoring add a new function arizona_init_common.
This will be used bus probe level initialisation that is common across
Arizona devices. For now just move the notifier chain initialisation in
there.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2bd6bf03

sound/soc/codecs/arizona.c

+2 −5
Original line number Diff line number Diff line
@@ -293,16 +293,13 @@ int arizona_init_gpio(struct snd_soc_codec *codec) 
}

EXPORT_SYMBOL_GPL(arizona_init_gpio);



int arizona_init_notifiers(struct snd_soc_codec *codec)

int arizona_init_common(struct arizona *arizona)

{

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->arizona;



	BLOCKING_INIT_NOTIFIER_HEAD(&arizona->notifier);



	return 0;

}

EXPORT_SYMBOL_GPL(arizona_init_notifiers);

EXPORT_SYMBOL_GPL(arizona_init_common);



const char * const arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = {

	"None",

sound/soc/codecs/arizona.h

+2 −1
Original line number Diff line number Diff line
@@ -313,7 +313,8 @@ int arizona_set_fll(struct arizona_fll *fll, int source, 
int arizona_init_spk(struct snd_soc_codec *codec);

int arizona_init_gpio(struct snd_soc_codec *codec);

int arizona_init_mono(struct snd_soc_codec *codec);

int arizona_init_notifiers(struct snd_soc_codec *codec);



int arizona_init_common(struct arizona *arizona);



int arizona_init_spk_irqs(struct arizona *arizona);

int arizona_free_spk_irqs(struct arizona *arizona);

sound/soc/codecs/cs47l24.c

+2 −1
Original line number Diff line number Diff line
@@ -1130,7 +1130,6 @@ static int cs47l24_codec_probe(struct snd_soc_codec *codec) 


	arizona_init_gpio(codec);

	arizona_init_mono(codec);

	arizona_init_notifiers(codec);



	ret = wm_adsp2_codec_probe(&priv->core.adsp[1], codec);

	if (ret)
@@ -1288,6 +1287,8 @@ static int cs47l24_probe(struct platform_device *pdev) 
		return ret;

	}



	arizona_init_common(arizona);



	ret = arizona_init_spk_irqs(arizona);

	if (ret < 0)

		goto err_dsp_irq;

sound/soc/codecs/wm5102.c

+2 −1
Original line number Diff line number Diff line
@@ -1951,7 +1951,6 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) 
		return ret;



	arizona_init_gpio(codec);

	arizona_init_notifiers(codec);



	snd_soc_component_disable_pin(component, "HAPTICS");
@@ -2098,6 +2097,8 @@ static int wm5102_probe(struct platform_device *pdev) 
		return ret;

	}



	arizona_init_common(arizona);



	ret = arizona_init_spk_irqs(arizona);

	if (ret < 0)

		goto err_dsp_irq;

sound/soc/codecs/wm5110.c

+2 −1
Original line number Diff line number Diff line
@@ -2290,7 +2290,6 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) 


	arizona_init_gpio(codec);

	arizona_init_mono(codec);

	arizona_init_notifiers(codec);



	for (i = 0; i < WM5110_NUM_ADSP; ++i) {

		ret = wm_adsp2_codec_probe(&priv->core.adsp[i], codec);
@@ -2454,6 +2453,8 @@ static int wm5110_probe(struct platform_device *pdev) 
		return ret;

	}



	arizona_init_common(arizona);



	ret = arizona_init_spk_irqs(arizona);

	if (ret < 0)

		goto err_dsp_irq;

CRA Git | Maintained and supported by SUSTech CRA and CCSE