ASoC: SOF: Intel: Convert to use the generic set_stream_data_offset ops

Switch from the IPC dependent ipc_pcm_params() ops to the IPC neutral
set_stream_data_offset().

Remove the no longer used hda_ipc_pcm_params() function as well.

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-9-ranjani.sridharan@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/apl.c b/sound/soc/sof/intel/apl.c
index cd8d08c175619f73ab447aa8d086a18e37c1310f..6721c8f95161b13de92ec9681109e244808a9bf4 100644 (file)
--- a/sound/soc/sof/intel/apl.c
+++ b/sound/soc/sof/intel/apl.c
@@ -56,7 +56,7 @@ const struct snd_sof_dsp_ops sof_apl_ops = {
        .get_window_offset = hda_dsp_ipc_get_window_offset,
 
        .ipc_msg_data   = hda_ipc_msg_data,
-       .ipc_pcm_params = hda_ipc_pcm_params,
+       .set_stream_data_offset = hda_set_stream_data_offset,
 
        /* machine driver */
        .machine_select = hda_machine_select,

diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
index d627b7498d5e5a646c24bd582fd392b3b04eab24..fb9682b2fe3232cff60defb034e24157dffbb37e 100644 (file)
--- a/sound/soc/sof/intel/bdw.c
+++ b/sound/soc/sof/intel/bdw.c
@@ -596,7 +596,7 @@ static const struct snd_sof_dsp_ops sof_bdw_ops = {
        .get_window_offset = bdw_get_window_offset,
 
        .ipc_msg_data   = sof_ipc_msg_data,
-       .ipc_pcm_params = sof_ipc_pcm_params,
+       .set_stream_data_offset = sof_set_stream_data_offset,
 
        /* machine driver */
        .machine_select = bdw_machine_select,

diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c
index dcfeaedb8fd5ffa21173d8797b7f3d05d5cd7cb8..bb84a4aa587a83daf0c6dc7a9ff6c592331b7e7f 100644 (file)
--- a/sound/soc/sof/intel/byt.c
+++ b/sound/soc/sof/intel/byt.c
@@ -250,7 +250,7 @@ static const struct snd_sof_dsp_ops sof_byt_ops = {
        .get_window_offset = atom_get_window_offset,
 
        .ipc_msg_data   = sof_ipc_msg_data,
-       .ipc_pcm_params = sof_ipc_pcm_params,
+       .set_stream_data_offset = sof_set_stream_data_offset,
 
        /* machine driver */
        .machine_select = atom_machine_select,
@@ -332,7 +332,7 @@ static const struct snd_sof_dsp_ops sof_cht_ops = {
        .get_window_offset = atom_get_window_offset,
 
        .ipc_msg_data   = sof_ipc_msg_data,
-       .ipc_pcm_params = sof_ipc_pcm_params,
+       .set_stream_data_offset = sof_set_stream_data_offset,
 
        /* machine driver */
        .machine_select = atom_machine_select,

diff --git a/sound/soc/sof/intel/cnl.c b/sound/soc/sof/intel/cnl.c
index bef27e8751f2072a9ed08ea8fc23875660839177..6a96470b967f5c57ea158f61c831e220407d717e 100644 (file)
--- a/sound/soc/sof/intel/cnl.c
+++ b/sound/soc/sof/intel/cnl.c
@@ -274,7 +274,7 @@ const struct snd_sof_dsp_ops sof_cnl_ops = {
        .get_window_offset = hda_dsp_ipc_get_window_offset,
 
        .ipc_msg_data   = hda_ipc_msg_data,
-       .ipc_pcm_params = hda_ipc_pcm_params,
+       .set_stream_data_offset = hda_set_stream_data_offset,
 
        /* machine driver */
        .machine_select = hda_machine_select,

diff --git a/sound/soc/sof/intel/hda-ipc.c b/sound/soc/sof/intel/hda-ipc.c
index 317c3ab7e768aaa4eb3af0fad8ee20a7ad98585d..0395638c43aeca13aed50102e16b5b698ae2b258 100644 (file)
--- a/sound/soc/sof/intel/hda-ipc.c
+++ b/sound/soc/sof/intel/hda-ipc.c
@@ -289,10 +289,3 @@ int hda_set_stream_data_offset(struct snd_sof_dev *sdev,
 
        return 0;
 }
-
-int hda_ipc_pcm_params(struct snd_sof_dev *sdev,
-                      struct snd_pcm_substream *substream,
-                      const struct sof_ipc_pcm_params_reply *reply)
-{
-       return hda_set_stream_data_offset(sdev, substream, reply->posn_offset);
-}

diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index 1e0a6d7bde17d6a95d55b3c5f8f507a1dc3f4116..13b509c9f48143f18a160a19877c7142655631e6 100644 (file)
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -566,9 +566,6 @@ int hda_dsp_stream_spib_config(struct snd_sof_dev *sdev,
 int hda_ipc_msg_data(struct snd_sof_dev *sdev,
                     struct snd_pcm_substream *substream,
                     void *p, size_t sz);
-int hda_ipc_pcm_params(struct snd_sof_dev *sdev,
-                      struct snd_pcm_substream *substream,
-                      const struct sof_ipc_pcm_params_reply *reply);
 int hda_set_stream_data_offset(struct snd_sof_dev *sdev,
                               struct snd_pcm_substream *substream,
                               size_t posn_offset);

diff --git a/sound/soc/sof/intel/icl.c b/sound/soc/sof/intel/icl.c
index f20ab60e8a523d436374834be4e2048508befddc..b44a649bfc0b4fd881fe22b90fb9f7633805c763 100644 (file)
--- a/sound/soc/sof/intel/icl.c
+++ b/sound/soc/sof/intel/icl.c
@@ -118,7 +118,7 @@ const struct snd_sof_dsp_ops sof_icl_ops = {
        .get_window_offset = hda_dsp_ipc_get_window_offset,
 
        .ipc_msg_data   = hda_ipc_msg_data,
-       .ipc_pcm_params = hda_ipc_pcm_params,
+       .set_stream_data_offset = hda_set_stream_data_offset,
 
        /* machine driver */
        .machine_select = hda_machine_select,

diff --git a/sound/soc/sof/intel/pci-tng.c b/sound/soc/sof/intel/pci-tng.c
index 7d5062f8076ea0da53ad22cc88d169a684e75967..6efef225973f613f100fdecb7d61f3734981da27 100644 (file)
--- a/sound/soc/sof/intel/pci-tng.c
+++ b/sound/soc/sof/intel/pci-tng.c
@@ -165,7 +165,7 @@ const struct snd_sof_dsp_ops sof_tng_ops = {
        .get_window_offset = atom_get_window_offset,
 
        .ipc_msg_data   = sof_ipc_msg_data,
-       .ipc_pcm_params = sof_ipc_pcm_params,
+       .set_stream_data_offset = sof_set_stream_data_offset,
 
        /* machine driver */
        .machine_select = atom_machine_select,

diff --git a/sound/soc/sof/intel/tgl.c b/sound/soc/sof/intel/tgl.c
index c7d1c244bc483239d111551ba33c475833bc7589..cb1c319d5bee6ffa322628fb2563a8d995cb287e 100644 (file)
--- a/sound/soc/sof/intel/tgl.c
+++ b/sound/soc/sof/intel/tgl.c
@@ -91,7 +91,7 @@ const struct snd_sof_dsp_ops sof_tgl_ops = {
        .get_window_offset = hda_dsp_ipc_get_window_offset,
 
        .ipc_msg_data   = hda_ipc_msg_data,
-       .ipc_pcm_params = hda_ipc_pcm_params,
+       .set_stream_data_offset = hda_set_stream_data_offset,
 
        /* machine driver */
        .machine_select = hda_machine_select,