Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: Back out post commit widget creation changes

Due to build errors revert commit c8597af855f3 (ASoC: topology: Allow
bespoke configuration post widget creation) until they can be fixed.

Signed-off-by: Mark Brown <broonie@kernel.org>

+2 -22
+2 -22
sound/soc/soc-topology.c
··· 344 344 return 0; 345 345 } 346 346 347 - /* optionally pass new dynamic widget to component driver. This is mainly for 348 - * external widgets where we can assign private data/ops */ 349 - static int soc_tplg_widget_ready(struct soc_tplg *tplg, 350 - struct snd_soc_dapm_widget *w, struct snd_soc_tplg_dapm_widget *tplg_w) 351 - { 352 - if (tplg->comp && tplg->ops && tplg->ops->widget_ready) 353 - return tplg->ops->widget_ready(tplg->comp, w, tplg_w); 354 - 355 - return 0; 356 - } 357 - 358 347 /* pass DAI configurations to component driver for extra initialization */ 359 348 static int soc_tplg_dai_load(struct soc_tplg *tplg, 360 - struct snd_soc_dai_driver *dai_drv, 361 - struct snd_soc_tplg_pcm *pcm, struct snd_soc_dai *dai) 349 + struct snd_soc_dai_driver *dai_drv) 362 350 { 363 351 if (tplg->comp && tplg->ops && tplg->ops->dai_load) 364 - return tplg->ops->dai_load(tplg->comp, dai_drv, pcm, dai); 352 + return tplg->ops->dai_load(tplg->comp, dai_drv); 365 353 366 354 return 0; 367 355 } ··· 1579 1591 widget->dobj.ops = tplg->ops; 1580 1592 widget->dobj.index = tplg->index; 1581 1593 list_add(&widget->dobj.list, &tplg->comp->dobj_list); 1582 - 1583 - ret = soc_tplg_widget_ready(tplg, widget, w); 1584 - if (ret < 0) 1585 - goto ready_err; 1586 - 1587 1594 return 0; 1588 1595 1589 - ready_err: 1590 - snd_soc_tplg_widget_remove(widget); 1591 - snd_soc_dapm_free_widget(widget); 1592 1596 hdr_err: 1593 1597 kfree(template.sname); 1594 1598 err: