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

Function mt8186_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: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com
Link: https://lore.kernel.org/r/20230503113413.149235-3-angelogioacchino.delregno@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org

diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.c b/sound/soc/sof/mediatek/mt8186/mt8186.c
index 597cb4476acb4183b3ab6c98c69ac953b6eaa7f0..419913c8474da3753f55fe6e11ec48861b98574b 100644 (file)
--- a/sound/soc/sof/mediatek/mt8186/mt8186.c
+++ b/sound/soc/sof/mediatek/mt8186/mt8186.c
@@ -48,47 +48,13 @@ static int mt8186_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 mt8186_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 mt8186_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);
-       mt8186_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);
 }