ASoC: Convert Goni to data based DAPM init (35f0678e) · Commits · 戴 / test

sound/soc/samsung/goni_wm8994.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -99,14 +99,6 @@ static int goni_wm8994_init(struct snd_soc_pcm_runtime *rtd)
		struct snd_soc_dapm_context *dapm = &codec->dapm;
		int ret;

		/* add goni specific widgets */
		snd_soc_dapm_new_controls(dapm, goni_dapm_widgets,
		ARRAY_SIZE(goni_dapm_widgets));

		/* set up goni specific audio routes */
		snd_soc_dapm_add_routes(dapm, goni_dapm_routes,
		ARRAY_SIZE(goni_dapm_routes));

		/* set endpoints to not connected */
		snd_soc_dapm_nc_pin(dapm, "IN2LP:VXRN");
		snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP");
		@@ -253,6 +245,11 @@ static struct snd_soc_card goni = {
		.name = "goni",
		.dai_link = goni_dai,
		.num_links = ARRAY_SIZE(goni_dai),

		.dapm_widgets = goni_dapm_widgets,
		.num_dapm_widgets = ARRAY_SIZE(goni_dapm_widgets),
		.dapm_routes = goni_dapm_routes,
		.num_dapm_routes = ARRAY_SIZE(goni_dapm_routes),
		};

		static int __init goni_init(void)