Unverified Commit 53154117 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: sof-audio: Treat tplg_ops->route_setup() as optional 



Other topology ops have been treated as optional, including the route_free.

Handle the route_setup in a conforming way as optional callback.
Note: we do not have checks for the callbacks itself which makes them all
optional in practice.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Link: https://lore.kernel.org/r/20221221102328.9635-2-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1b929c02

sound/soc/sof/sof-audio.c

+6 −4
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ int sof_route_setup(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget *wsourc 
	struct snd_sof_widget *sink_widget = wsink->dobj.private;

	struct snd_sof_route *sroute;

	bool route_found = false;

	int ret;



	/* ignore routes involving virtual widgets in topology */

	switch (src_widget->id) {
@@ -212,9 +211,12 @@ int sof_route_setup(struct snd_sof_dev *sdev, struct snd_soc_dapm_widget *wsourc 
	if (sroute->setup)

		return 0;



	ret = ipc_tplg_ops->route_setup(sdev, sroute);

	if (ipc_tplg_ops->route_setup) {

		int ret = ipc_tplg_ops->route_setup(sdev, sroute);



		if (ret < 0)

			return ret;

	}



	sroute->setup = true;

	return 0;