ASoC: SOF: Remove ipc_pcm_params() ops

All users have been converted to use the IPC agnostic
set_stream_data_offsett()

Remove all code related to the old API.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220310042720.976809-11-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/ops.h b/sound/soc/sof/ops.h
index aeea73efcb2fad7e073c0f684b8bfcde4d8cdbf7..a194746637673b462d196925ab85b906eb9edbba 100644 (file)
--- a/sound/soc/sof/ops.h
+++ b/sound/soc/sof/ops.h
@@ -466,19 +466,6 @@ static inline int snd_sof_ipc_msg_data(struct snd_sof_dev *sdev,
 {
        return sof_ops(sdev)->ipc_msg_data(sdev, substream, p, sz);
 }
-
-/* host configure DSP HW parameters */
-static inline int
-snd_sof_ipc_pcm_params(struct snd_sof_dev *sdev,
-                      struct snd_pcm_substream *substream,
-                      const struct sof_ipc_pcm_params_reply *reply)
-{
-       if (sof_ops(sdev) && sof_ops(sdev)->ipc_pcm_params)
-               return sof_ops(sdev)->ipc_pcm_params(sdev, substream, reply);
-
-       return 0;
-}
-
 /* host side configuration of the stream's data offset in stream mailbox area */
 static inline int
 snd_sof_set_stream_data_offset(struct snd_sof_dev *sdev,

diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
index 150f9ac872c67b0098418311b59aeb9bd24c14b8..1661b0bc6f12f4d5c0fced62f18504256c055d93 100644 (file)
--- a/sound/soc/sof/pcm.c
+++ b/sound/soc/sof/pcm.c
@@ -269,13 +269,6 @@ static int sof_pcm_hw_params(struct snd_soc_component *component,
                return ret;
        }
 
-       ret = snd_sof_ipc_pcm_params(sdev, substream, &ipc_params_reply);
-       if (ret < 0) {
-               dev_err(component->dev, "%s: got wrong reply for PCM %d\n",
-                       __func__, spcm->pcm.pcm_id);
-               return ret;
-       }
-
        ret = snd_sof_set_stream_data_offset(sdev, substream,
                                             ipc_params_reply.posn_offset);
        if (ret < 0) {

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index e6fd3910634f4c7d0f04ba7b9915809c66f1af31..ef5a2adae5c72ff96c7b6fda26460c5bd2ba9d02 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -221,11 +221,6 @@ struct snd_sof_dsp_ops {
                            struct snd_pcm_substream *substream,
                            void *p, size_t sz); /* mandatory */
 
-       /* host configure DSP HW parameters */
-       int (*ipc_pcm_params)(struct snd_sof_dev *sdev,
-                             struct snd_pcm_substream *substream,
-                             const struct sof_ipc_pcm_params_reply *reply); /* optional */
-
        /* host side configuration of the stream's data offset in stream mailbox area */
        int (*set_stream_data_offset)(struct snd_sof_dev *sdev,
                                      struct snd_pcm_substream *substream,
@@ -635,9 +630,6 @@ int sof_fw_ready(struct snd_sof_dev *sdev, u32 msg_id);
 int sof_ipc_msg_data(struct snd_sof_dev *sdev,
                     struct snd_pcm_substream *substream,
                     void *p, size_t sz);
-int sof_ipc_pcm_params(struct snd_sof_dev *sdev,
-                      struct snd_pcm_substream *substream,
-                      const struct sof_ipc_pcm_params_reply *reply);
 int sof_set_stream_data_offset(struct snd_sof_dev *sdev,
                               struct snd_pcm_substream *substream,
                               size_t posn_offset);

diff --git a/sound/soc/sof/stream-ipc.c b/sound/soc/sof/stream-ipc.c
index b7b96b9f52799ac99e01b249990f7eb484673c6a..5f1ceeea893a539e4f60a9872e766b005e6a8006 100644 (file)
--- a/sound/soc/sof/stream-ipc.c
+++ b/sound/soc/sof/stream-ipc.c
@@ -65,14 +65,6 @@ int sof_set_stream_data_offset(struct snd_sof_dev *sdev,
 }
 EXPORT_SYMBOL(sof_set_stream_data_offset);
 
-int sof_ipc_pcm_params(struct snd_sof_dev *sdev,
-                      struct snd_pcm_substream *substream,
-                      const struct sof_ipc_pcm_params_reply *reply)
-{
-       return sof_set_stream_data_offset(sdev, substream, reply->posn_offset);
-}
-EXPORT_SYMBOL(sof_ipc_pcm_params);
-
 int sof_stream_pcm_open(struct snd_sof_dev *sdev,
                        struct snd_pcm_substream *substream)
 {