Unverified Commit 00f19253 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

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: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220310042720.976809-11-ranjani.sridharan@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f0383ade

sound/soc/sof/ops.h

+0 −13
Original line number Diff line number Diff line
@@ -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,

sound/soc/sof/pcm.c

+0 −7
Original line number Diff line number Diff line
@@ -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) {

sound/soc/sof/sof-priv.h

+0 −8
Original line number Diff line number Diff line
@@ -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);

sound/soc/sof/stream-ipc.c

+0 −8
Original line number Diff line number Diff line
@@ -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)

{