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

ASoC: wm8737: Use table based DAPM and control setup 



Makes the code a bit cleaner and shorter.

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/wm8737.c

+7 −15
Original line number Diff line number Diff line
@@ -277,17 +277,6 @@ static const struct snd_soc_dapm_route intercon[] = { 
	{ "AIF", NULL, "ADCR" },

};



static int wm8737_add_widgets(struct snd_soc_codec *codec)

{

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	snd_soc_dapm_new_controls(dapm, wm8737_dapm_widgets,

				  ARRAY_SIZE(wm8737_dapm_widgets));

	snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));



	return 0;

}



/* codec mclk clock divider coefficients */

static const struct {

	u32 mclk;
@@ -593,10 +582,6 @@ static int wm8737_probe(struct snd_soc_codec *codec) 
	/* Bias level configuration will have done an extra enable */

	regulator_bulk_disable(ARRAY_SIZE(wm8737->supplies), wm8737->supplies);



	snd_soc_add_codec_controls(codec, wm8737_snd_controls,

			     ARRAY_SIZE(wm8737_snd_controls));

	wm8737_add_widgets(codec);



	return 0;



err_enable:
@@ -617,6 +602,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8737 = { 
	.suspend	= wm8737_suspend,

	.resume		= wm8737_resume,

	.set_bias_level = wm8737_set_bias_level,



	.controls = wm8737_snd_controls,

	.num_controls = ARRAY_SIZE(wm8737_snd_controls),

	.dapm_widgets = wm8737_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(wm8737_dapm_widgets),

	.dapm_routes = intercon,

	.num_dapm_routes = ARRAY_SIZE(intercon),

};



static const struct of_device_id wm8737_of_match[] = {