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

ASoC: SOF: ipc: Separate the ops checks by functions/topics 



Separate the mandatory ops checks by topics (pcm and topology for now) to
be able to provide intuitive feedback on the possible missing ops and to
make it easier to add new mandatory ops checks in the future.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220405172708.122168-9-ranjani.sridharan@linux.intel.com


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

sound/soc/sof/ipc.c

+9 −3
Original line number Diff line number Diff line
@@ -1043,6 +1043,7 @@ struct snd_sof_ipc *snd_sof_ipc_init(struct snd_sof_dev *sdev) 
{

	struct snd_sof_ipc *ipc;

	struct snd_sof_ipc_msg *msg;

	const struct sof_ipc_ops *ops;



	ipc = devm_kzalloc(sdev->dev, sizeof(*ipc), GFP_KERNEL);

	if (!ipc)
@@ -1062,11 +1063,16 @@ struct snd_sof_ipc *snd_sof_ipc_init(struct snd_sof_dev *sdev) 
	 * versions, this will need to be modified to use the selected version at runtime.

	 */

	ipc->ops = &ipc3_ops;

	ops = ipc->ops;



	/* check for mandatory ops */

	if (!ipc->ops->pcm || !ipc->ops->tplg || !ipc->ops->tplg->widget ||

	    !ipc->ops->tplg->control) {

		dev_err(sdev->dev, "Invalid IPC ops\n");

	if (!ops->pcm) {

		dev_err(sdev->dev, "Missing IPC PCM ops\n");

		return NULL;

	}



	if (!ops->tplg || !ops->tplg->widget || !ops->tplg->control) {

		dev_err(sdev->dev, "Missing IPC topology ops\n");

		return NULL;

	}