Unverified Commit 06ba8020 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Mark Brown
Browse files

ASoC: SOF: mediatek: mt8195: Use snd_sof_ipc_process_reply() helper 



Function mt8195_get_reply() performs practically the same operation
as the common snd_sof_ipc_get_reply() helper: removing the custom
function allows us to simply perform a call to the sof-priv helper
snd_sof_ipc_process_reply(), simplifying and shortening this driver
and getting all the benefits of using a common API.

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20230503113413.149235-2-angelogioacchino.delregno@collabora.com


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

sound/soc/sof/mediatek/mt8195/mt8195.c

+1 −35
Original line number Diff line number Diff line
@@ -49,47 +49,13 @@ static int mt8195_send_msg(struct snd_sof_dev *sdev, 
	return mtk_adsp_ipc_send(priv->dsp_ipc, MTK_ADSP_IPC_REQ, MTK_ADSP_IPC_OP_REQ);

}



static void mt8195_get_reply(struct snd_sof_dev *sdev)

{

	struct snd_sof_ipc_msg *msg = sdev->msg;

	struct sof_ipc_reply reply;

	int ret = 0;



	if (!msg) {

		dev_warn(sdev->dev, "unexpected ipc interrupt\n");

		return;

	}



	/* get reply */

	sof_mailbox_read(sdev, sdev->host_box.offset, &reply, sizeof(reply));

	if (reply.error < 0) {

		memcpy(msg->reply_data, &reply, sizeof(reply));

		ret = reply.error;

	} else {

		/* reply has correct size? */

		if (reply.hdr.size != msg->reply_size) {

			dev_err(sdev->dev, "error: reply expected %zu got %u bytes\n",

				msg->reply_size, reply.hdr.size);

			ret = -EINVAL;

		}



		/* read the message */

		if (msg->reply_size > 0)

			sof_mailbox_read(sdev, sdev->host_box.offset,

					 msg->reply_data, msg->reply_size);

	}



	msg->reply_error = ret;

}



static void mt8195_dsp_handle_reply(struct mtk_adsp_ipc *ipc)

{

	struct adsp_priv *priv = mtk_adsp_ipc_get_data(ipc);

	unsigned long flags;



	spin_lock_irqsave(&priv->sdev->ipc_lock, flags);

	mt8195_get_reply(priv->sdev);

	snd_sof_ipc_reply(priv->sdev, 0);

	snd_sof_ipc_process_reply(priv->sdev, 0);

	spin_unlock_irqrestore(&priv->sdev->ipc_lock, flags);

}