ASoC: Convert SmartQ to table based init (257fe593) · Commits · 戴 / test

sound/soc/samsung/smartq_wm8987.c

+7 −14

Original line number	Diff line number	Diff line
		@@ -153,20 +153,6 @@ static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
		struct snd_soc_dapm_context *dapm = &codec->dapm;
		int err = 0;

		/* Add SmartQ specific widgets */
		snd_soc_dapm_new_controls(dapm, wm8987_dapm_widgets,
		ARRAY_SIZE(wm8987_dapm_widgets));

		/* add SmartQ specific controls */
		err = snd_soc_add_controls(codec, wm8987_smartq_controls,
		ARRAY_SIZE(wm8987_smartq_controls));

		if (err < 0)
		return err;

		/* setup SmartQ specific audio path */
		snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));

		/* set endpoints to not connected */
		snd_soc_dapm_nc_pin(dapm, "LINPUT1");
		snd_soc_dapm_nc_pin(dapm, "RINPUT1");
		@@ -213,6 +199,13 @@ static struct snd_soc_card snd_soc_smartq = {
		.name = "SmartQ",
		.dai_link = smartq_dai,
		.num_links = ARRAY_SIZE(smartq_dai),

		.dapm_widgets = wm8987_dapm_widgets,
		.num_dapm_widgets = ARRAY_SIZE(wm8987_dapm_widgets),
		.dapm_routes = audio_map,
		.num_dapm_routes = ARRAY_SIZE(audio_map),
		.controls = wm8987_smartq_controls,
		.num_controls = ARRAY_SIZE(wm8987_smartq_controls),
		};

		static struct platform_device *smartq_snd_device;