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

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

ASoC: wm8961: Use table based DAPM and control setup 



Makes the code a bit cleaner.

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 f114040e

sound/soc/codecs/wm8961.c

+7 −7
Original line number Diff line number Diff line
@@ -835,7 +835,6 @@ static struct snd_soc_dai_driver wm8961_dai = { 


static int wm8961_probe(struct snd_soc_codec *codec)

{

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	u16 reg;



	/* Enable class W */
@@ -873,12 +872,6 @@ static int wm8961_probe(struct snd_soc_codec *codec) 


	wm8961_set_bias_level(codec, SND_SOC_BIAS_STANDBY);



	snd_soc_add_codec_controls(codec, wm8961_snd_controls,

				ARRAY_SIZE(wm8961_snd_controls));

	snd_soc_dapm_new_controls(dapm, wm8961_dapm_widgets,

				  ARRAY_SIZE(wm8961_dapm_widgets));

	snd_soc_dapm_add_routes(dapm, audio_paths, ARRAY_SIZE(audio_paths));



	return 0;

}
@@ -915,6 +908,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8961 = { 
	.suspend =	wm8961_suspend,

	.resume =	wm8961_resume,

	.set_bias_level = wm8961_set_bias_level,



	.controls = wm8961_snd_controls,

	.num_controls = ARRAY_SIZE(wm8961_snd_controls),

	.dapm_widgets = wm8961_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(wm8961_dapm_widgets),

	.dapm_routes = audio_paths,

	.num_dapm_routes = ARRAY_SIZE(audio_paths),

};



static const struct regmap_config wm8961_regmap = {