Skip to content

Commit cf73363

Browse files
ujfalusibroonie
ujfalusi
authored and
broonie
committed
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>
1 parent 29e3aa0 commit cf73363

9 files changed

Lines changed: 8 additions & 18 deletions

File tree

‎sound/soc/sof/intel/apl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const struct snd_sof_dsp_ops sof_apl_ops = {
5656
.get_window_offset = hda_dsp_ipc_get_window_offset,
5757

5858
.ipc_msg_data = hda_ipc_msg_data,
59-
.ipc_pcm_params = hda_ipc_pcm_params,
59+
.set_stream_data_offset = hda_set_stream_data_offset,
6060

6161
/* machine driver */
6262
.machine_select = hda_machine_select,

‎sound/soc/sof/intel/bdw.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ static const struct snd_sof_dsp_ops sof_bdw_ops = {
596596
.get_window_offset = bdw_get_window_offset,
597597

598598
.ipc_msg_data = sof_ipc_msg_data,
599-
.ipc_pcm_params = sof_ipc_pcm_params,
599+
.set_stream_data_offset = sof_set_stream_data_offset,
600600

601601
/* machine driver */
602602
.machine_select = bdw_machine_select,

‎sound/soc/sof/intel/byt.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static const struct snd_sof_dsp_ops sof_byt_ops = {
250250
.get_window_offset = atom_get_window_offset,
251251

252252
.ipc_msg_data = sof_ipc_msg_data,
253-
.ipc_pcm_params = sof_ipc_pcm_params,
253+
.set_stream_data_offset = sof_set_stream_data_offset,
254254

255255
/* machine driver */
256256
.machine_select = atom_machine_select,
@@ -332,7 +332,7 @@ static const struct snd_sof_dsp_ops sof_cht_ops = {
332332
.get_window_offset = atom_get_window_offset,
333333

334334
.ipc_msg_data = sof_ipc_msg_data,
335-
.ipc_pcm_params = sof_ipc_pcm_params,
335+
.set_stream_data_offset = sof_set_stream_data_offset,
336336

337337
/* machine driver */
338338
.machine_select = atom_machine_select,

‎sound/soc/sof/intel/cnl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ const struct snd_sof_dsp_ops sof_cnl_ops = {
274274
.get_window_offset = hda_dsp_ipc_get_window_offset,
275275

276276
.ipc_msg_data = hda_ipc_msg_data,
277-
.ipc_pcm_params = hda_ipc_pcm_params,
277+
.set_stream_data_offset = hda_set_stream_data_offset,
278278

279279
/* machine driver */
280280
.machine_select = hda_machine_select,

‎sound/soc/sof/intel/hda-ipc.c‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,3 @@ int hda_set_stream_data_offset(struct snd_sof_dev *sdev,
289289

290290
return 0;
291291
}
292-
293-
int hda_ipc_pcm_params(struct snd_sof_dev *sdev,
294-
struct snd_pcm_substream *substream,
295-
const struct sof_ipc_pcm_params_reply *reply)
296-
{
297-
return hda_set_stream_data_offset(sdev, substream, reply->posn_offset);
298-
}

‎sound/soc/sof/intel/hda.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -566,9 +566,6 @@ int hda_dsp_stream_spib_config(struct snd_sof_dev *sdev,
566566
int hda_ipc_msg_data(struct snd_sof_dev *sdev,
567567
struct snd_pcm_substream *substream,
568568
void *p, size_t sz);
569-
int hda_ipc_pcm_params(struct snd_sof_dev *sdev,
570-
struct snd_pcm_substream *substream,
571-
const struct sof_ipc_pcm_params_reply *reply);
572569
int hda_set_stream_data_offset(struct snd_sof_dev *sdev,
573570
struct snd_pcm_substream *substream,
574571
size_t posn_offset);

‎sound/soc/sof/intel/icl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ const struct snd_sof_dsp_ops sof_icl_ops = {
118118
.get_window_offset = hda_dsp_ipc_get_window_offset,
119119

120120
.ipc_msg_data = hda_ipc_msg_data,
121-
.ipc_pcm_params = hda_ipc_pcm_params,
121+
.set_stream_data_offset = hda_set_stream_data_offset,
122122

123123
/* machine driver */
124124
.machine_select = hda_machine_select,

‎sound/soc/sof/intel/pci-tng.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ const struct snd_sof_dsp_ops sof_tng_ops = {
165165
.get_window_offset = atom_get_window_offset,
166166

167167
.ipc_msg_data = sof_ipc_msg_data,
168-
.ipc_pcm_params = sof_ipc_pcm_params,
168+
.set_stream_data_offset = sof_set_stream_data_offset,
169169

170170
/* machine driver */
171171
.machine_select = atom_machine_select,

‎sound/soc/sof/intel/tgl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ const struct snd_sof_dsp_ops sof_tgl_ops = {
9191
.get_window_offset = hda_dsp_ipc_get_window_offset,
9292

9393
.ipc_msg_data = hda_ipc_msg_data,
94-
.ipc_pcm_params = hda_ipc_pcm_params,
94+
.set_stream_data_offset = hda_set_stream_data_offset,
9595

9696
/* machine driver */
9797
.machine_select = hda_machine_select,

0 commit comments

Comments
 (0)