Unverified Commit 7cc7b9ba authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: topology: remove sof_load_pipeline_ipc() 



Remove the function sof_load_pipeline_ipc() and directly
send the IPC instead. The pipeline core is already enabled
with the call to sof_pipeline_core_enable() in sof_widget_setup().

Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20211119192621.4096077-7-kai.vehmanen@linux.intel.com


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

sound/soc/sof/sof-audio.c

+2 −1
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ int sof_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget) 
		break;

	case snd_soc_dapm_scheduler:

		pipeline = swidget->private;

		ret = sof_load_pipeline_ipc(sdev, pipeline, &r);

		ret = sof_ipc_tx_message(sdev->ipc, pipeline->hdr.cmd, pipeline,

					 sizeof(*pipeline), &r, sizeof(r));

		break;

	default:

		hdr = swidget->private;

sound/soc/sof/sof-audio.h

+0 −4
Original line number Diff line number Diff line
@@ -184,10 +184,6 @@ void snd_sof_control_notify(struct snd_sof_dev *sdev, 
int snd_sof_load_topology(struct snd_soc_component *scomp, const char *file);

int snd_sof_complete_pipeline(struct snd_sof_dev *sdev,

			      struct snd_sof_widget *swidget);



int sof_load_pipeline_ipc(struct snd_sof_dev *sdev,

			  struct sof_ipc_pipe_new *pipeline,

			  struct sof_ipc_comp_reply *r);

int sof_pipeline_core_enable(struct snd_sof_dev *sdev,

			     const struct snd_sof_widget *swidget);

sound/soc/sof/topology.c

+0 −17
Original line number Diff line number Diff line
@@ -1707,23 +1707,6 @@ static int sof_widget_load_pcm(struct snd_soc_component *scomp, int index, 
/*

 * Pipeline Topology

 */

int sof_load_pipeline_ipc(struct snd_sof_dev *sdev,

			  struct sof_ipc_pipe_new *pipeline,

			  struct sof_ipc_comp_reply *r)

{

	int ret = sof_core_enable(sdev, pipeline->core);



	if (ret < 0)

		return ret;



	ret = sof_ipc_tx_message(sdev->ipc, pipeline->hdr.cmd, pipeline,

				 sizeof(*pipeline), r, sizeof(*r));

	if (ret < 0)

		dev_err(sdev->dev, "error: load pipeline ipc failure\n");



	return ret;

}



static int sof_widget_load_pipeline(struct snd_soc_component *scomp, int index,

				    struct snd_sof_widget *swidget,

				    struct snd_soc_tplg_dapm_widget *tw)