Skip to content

Commit 00f1925

Browse files
ujfalusibroonie
authored andcommitted
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>
1 parent f0383ad commit 00f1925

4 files changed

Lines changed: 0 additions & 36 deletions

File tree

sound/soc/sof/ops.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -466,19 +466,6 @@ static inline int snd_sof_ipc_msg_data(struct snd_sof_dev *sdev,
466466
{
467467
return sof_ops(sdev)->ipc_msg_data(sdev, substream, p, sz);
468468
}
469-
470-
/* host configure DSP HW parameters */
471-
static inline int
472-
snd_sof_ipc_pcm_params(struct snd_sof_dev *sdev,
473-
struct snd_pcm_substream *substream,
474-
const struct sof_ipc_pcm_params_reply *reply)
475-
{
476-
if (sof_ops(sdev) && sof_ops(sdev)->ipc_pcm_params)
477-
return sof_ops(sdev)->ipc_pcm_params(sdev, substream, reply);
478-
479-
return 0;
480-
}
481-
482469
/* host side configuration of the stream's data offset in stream mailbox area */
483470
static inline int
484471
snd_sof_set_stream_data_offset(struct snd_sof_dev *sdev,

sound/soc/sof/pcm.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,13 +269,6 @@ static int sof_pcm_hw_params(struct snd_soc_component *component,
269269
return ret;
270270
}
271271

272-
ret = snd_sof_ipc_pcm_params(sdev, substream, &ipc_params_reply);
273-
if (ret < 0) {
274-
dev_err(component->dev, "%s: got wrong reply for PCM %d\n",
275-
__func__, spcm->pcm.pcm_id);
276-
return ret;
277-
}
278-
279272
ret = snd_sof_set_stream_data_offset(sdev, substream,
280273
ipc_params_reply.posn_offset);
281274
if (ret < 0) {

sound/soc/sof/sof-priv.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,6 @@ struct snd_sof_dsp_ops {
221221
struct snd_pcm_substream *substream,
222222
void *p, size_t sz); /* mandatory */
223223

224-
/* host configure DSP HW parameters */
225-
int (*ipc_pcm_params)(struct snd_sof_dev *sdev,
226-
struct snd_pcm_substream *substream,
227-
const struct sof_ipc_pcm_params_reply *reply); /* optional */
228-
229224
/* host side configuration of the stream's data offset in stream mailbox area */
230225
int (*set_stream_data_offset)(struct snd_sof_dev *sdev,
231226
struct snd_pcm_substream *substream,
@@ -635,9 +630,6 @@ int sof_fw_ready(struct snd_sof_dev *sdev, u32 msg_id);
635630
int sof_ipc_msg_data(struct snd_sof_dev *sdev,
636631
struct snd_pcm_substream *substream,
637632
void *p, size_t sz);
638-
int sof_ipc_pcm_params(struct snd_sof_dev *sdev,
639-
struct snd_pcm_substream *substream,
640-
const struct sof_ipc_pcm_params_reply *reply);
641633
int sof_set_stream_data_offset(struct snd_sof_dev *sdev,
642634
struct snd_pcm_substream *substream,
643635
size_t posn_offset);

sound/soc/sof/stream-ipc.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@ int sof_set_stream_data_offset(struct snd_sof_dev *sdev,
6565
}
6666
EXPORT_SYMBOL(sof_set_stream_data_offset);
6767

68-
int sof_ipc_pcm_params(struct snd_sof_dev *sdev,
69-
struct snd_pcm_substream *substream,
70-
const struct sof_ipc_pcm_params_reply *reply)
71-
{
72-
return sof_set_stream_data_offset(sdev, substream, reply->posn_offset);
73-
}
74-
EXPORT_SYMBOL(sof_ipc_pcm_params);
75-
7668
int sof_stream_pcm_open(struct snd_sof_dev *sdev,
7769
struct snd_pcm_substream *substream)
7870
{

0 commit comments

Comments
 (0)