ASoC: SOF: ipc: Remove snd_sof_dsp_mailbox_init()

The snd_sof_dsp_mailbox_init() is called only from sof_get_windows()
to set the sdev->dsp_box.offset/size and sdev->host_box.offset/size

Instead of using a function, set the offsets and sizes like we do for the
other boxes in sof_get_windows().

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20210915122116.18317-3-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c
index a4fe007a0e4dab72145ef185cf21b69f04587741..9ca3681d266d98416f66b505e83f6e7478589a92 100644 (file)
--- a/sound/soc/sof/ipc.c
+++ b/sound/soc/sof/ipc.c
@@ -790,22 +790,6 @@ int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol,
 }
 EXPORT_SYMBOL(snd_sof_ipc_set_get_comp_data);
 
-/*
- * IPC layer enumeration.
- */
-
-int snd_sof_dsp_mailbox_init(struct snd_sof_dev *sdev, u32 dspbox,
-                            size_t dspbox_size, u32 hostbox,
-                            size_t hostbox_size)
-{
-       sdev->dsp_box.offset = dspbox;
-       sdev->dsp_box.size = dspbox_size;
-       sdev->host_box.offset = hostbox;
-       sdev->host_box.size = hostbox_size;
-       return 0;
-}
-EXPORT_SYMBOL(snd_sof_dsp_mailbox_init);
-
 int snd_sof_ipc_valid(struct snd_sof_dev *sdev)
 {
        struct sof_ipc_fw_ready *ready = &sdev->fw_ready;

diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c
index 5308c32e26faadfa66933b74b9e322cdb590895f..c0dbc0e15416fe217aef9d49e38eb8e2b070a018 100644 (file)
--- a/sound/soc/sof/loader.c
+++ b/sound/soc/sof/loader.c
@@ -470,8 +470,12 @@ static void sof_get_windows(struct snd_sof_dev *sdev)
                return;
        }
 
-       snd_sof_dsp_mailbox_init(sdev, inbox_offset, inbox_size,
-                                outbox_offset, outbox_size);
+       sdev->dsp_box.offset = inbox_offset;
+       sdev->dsp_box.size = inbox_size;
+
+       sdev->host_box.offset = outbox_offset;
+       sdev->host_box.size = outbox_size;
+
        sdev->stream_box.offset = stream_offset;
        sdev->stream_box.size = stream_size;
 

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index 1adbcda0b364e1ad7030ac9fa799b9cf79a7da21..b0cefd6beda5c7f4fc7f060f07a67cdce054c058 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -502,9 +502,6 @@ void snd_sof_ipc_reply(struct snd_sof_dev *sdev, u32 msg_id);
 void snd_sof_ipc_msgs_rx(struct snd_sof_dev *sdev);
 int snd_sof_ipc_stream_pcm_params(struct snd_sof_dev *sdev,
                                  struct sof_ipc_pcm_params *params);
-int snd_sof_dsp_mailbox_init(struct snd_sof_dev *sdev, u32 dspbox,
-                            size_t dspbox_size, u32 hostbox,
-                            size_t hostbox_size);
 int snd_sof_ipc_valid(struct snd_sof_dev *sdev);
 int sof_ipc_tx_message(struct snd_sof_ipc *ipc, u32 header,
                       void *msg_data, size_t msg_bytes, void *reply_data,