Commit 51fb1a87 authored by Lu Guanqun's avatar Lu Guanqun Committed by Mark Brown
Browse files

ASoC: Use data based init for cx20442 DAPM 



Signed-off-by: default avatarLu Guanqun <guanqun.lu@intel.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent fc3b9230

sound/soc/codecs/cx20442.c

+4 −14
Original line number Diff line number Diff line
@@ -86,18 +86,6 @@ static const struct snd_soc_dapm_route cx20442_audio_map[] = { 
	{"ADC", NULL, "Input Mixer"},

};



static int cx20442_add_widgets(struct snd_soc_codec *codec)

{

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	snd_soc_dapm_new_controls(dapm, cx20442_dapm_widgets,

				  ARRAY_SIZE(cx20442_dapm_widgets));

	snd_soc_dapm_add_routes(dapm, cx20442_audio_map,

				ARRAY_SIZE(cx20442_audio_map));



	return 0;

}



static unsigned int cx20442_read_reg_cache(struct snd_soc_codec *codec,

							unsigned int reg)

{
@@ -344,8 +332,6 @@ static int cx20442_codec_probe(struct snd_soc_codec *codec) 
		return -ENOMEM;

	snd_soc_codec_set_drvdata(codec, cx20442);



	cx20442_add_widgets(codec);



	cx20442->control_data = NULL;

	codec->hw_write = NULL;

	codec->card->pop_time = 0;
@@ -377,6 +363,10 @@ static struct snd_soc_codec_driver cx20442_codec_dev = { 
	.reg_word_size = sizeof(u8),

	.read = cx20442_read_reg_cache,

	.write = cx20442_write,

	.dapm_widgets = cx20442_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(cx20442_dapm_widgets),

	.dapm_routes = cx20442_audio_map,

	.num_dapm_routes = ARRAY_SIZE(cx20442_audio_map),

};



static int cx20442_platform_probe(struct platform_device *pdev)