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 cd8d08c..6721c8f 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 d627b74..fb9682b 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 dcfeaed..bb84a4a 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 bef27e8..6a96470 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 317c3ab..0395638 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 1e0a6d7..13b509c 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 f20ab60..b44a649 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 7d5062f..6efef22 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 c7d1c24..cb1c319 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,