Unverified Commit 4d5f4119 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: sof: convert not to use asoc_xxx() 



ASoC is now unified asoc_xxx() into snd_soc_xxx().
This patch convert asoc_xxx() to snd_soc_xxx().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87sf71fo32.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/sof/ipc3-pcm.c

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ static int sof_ipc3_pcm_hw_free(struct snd_soc_component *component, 
				struct snd_pcm_substream *substream)

{

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct sof_ipc_stream stream;

	struct snd_sof_pcm *spcm;
@@ -42,7 +42,7 @@ static int sof_ipc3_pcm_hw_params(struct snd_soc_component *component, 
				  struct snd_sof_platform_stream_params *platform_params)

{

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct sof_ipc_fw_version *v = &sdev->fw_ready.version;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct sof_ipc_pcm_params_reply ipc_params_reply;
@@ -142,7 +142,7 @@ static int sof_ipc3_pcm_hw_params(struct snd_soc_component *component, 
static int sof_ipc3_pcm_trigger(struct snd_soc_component *component,

				struct snd_pcm_substream *substream, int cmd)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct sof_ipc_stream stream;

	struct snd_sof_pcm *spcm;

sound/soc/sof/ipc4-pcm.c

+4 −4
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component, 
				      struct snd_pcm_substream *substream, int state, int cmd)

{

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_sof_pcm_stream_pipeline_list *pipeline_list;

	struct sof_ipc4_fw_data *ipc4_data = sdev->private;

	struct ipc4_pipeline_set_state_data *trigger_list;
@@ -519,7 +519,7 @@ static int sof_ipc4_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, 
	struct snd_sof_dai *dai = snd_sof_find_dai(component, rtd->dai_link->name);

	struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);

	struct sof_ipc4_audio_format *ipc4_fmt;

	struct sof_ipc4_copier *ipc4_copier;

	bool single_fmt = false;
@@ -743,7 +743,7 @@ static int sof_ipc4_pcm_hw_params(struct snd_soc_component *component, 
				  struct snd_sof_platform_stream_params *platform_params)

{

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct sof_ipc4_timestamp_info *time_info;

	struct snd_sof_pcm *spcm;
@@ -804,7 +804,7 @@ static snd_pcm_sframes_t sof_ipc4_pcm_delay(struct snd_soc_component *component, 
					    struct snd_pcm_substream *substream)

{

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct sof_ipc4_timestamp_info *time_info;

	struct sof_ipc4_llp_reading_slot llp;

	snd_pcm_uframes_t head_ptr, tail_ptr;

sound/soc/sof/nocodec.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static int sof_nocodec_bes_setup(struct device *dev, 
		links[i].stream_name = links[i].name;



		links[i].cpus = &dlc[0];

		links[i].codecs = &asoc_dummy_dlc;

		links[i].codecs = &snd_soc_dummy_dlc;

		links[i].platforms = &dlc[1];



		links[i].num_cpus = 1;

sound/soc/sof/pcm.c

+9 −9
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static int create_page_table(struct snd_soc_component *component, 
			     struct snd_pcm_substream *substream,

			     unsigned char *dma_area, size_t size)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_sof_pcm *spcm;

	struct snd_dma_buffer *dmab = snd_pcm_get_dma_buf(substream);

	int stream = substream->stream;
@@ -60,7 +60,7 @@ void snd_sof_pcm_init_elapsed_work(struct work_struct *work) 
 */

void snd_sof_pcm_period_elapsed(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_component *component =

		snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME);

	struct snd_sof_pcm *spcm;
@@ -124,7 +124,7 @@ static int sof_pcm_hw_params(struct snd_soc_component *component, 
			     struct snd_pcm_hw_params *params)

{

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	const struct sof_ipc_pcm_ops *pcm_ops = sof_ipc_get_ops(sdev, pcm);

	struct snd_sof_platform_stream_params platform_params = { 0 };

	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -194,7 +194,7 @@ static int sof_pcm_hw_params(struct snd_soc_component *component, 
static int sof_pcm_hw_free(struct snd_soc_component *component,

			   struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	const struct sof_ipc_pcm_ops *pcm_ops = sof_ipc_get_ops(sdev, pcm);

	struct snd_sof_pcm *spcm;
@@ -246,7 +246,7 @@ static int sof_pcm_hw_free(struct snd_soc_component *component, 
static int sof_pcm_prepare(struct snd_soc_component *component,

			   struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_sof_pcm *spcm;

	int ret;
@@ -283,7 +283,7 @@ static int sof_pcm_prepare(struct snd_soc_component *component, 
static int sof_pcm_trigger(struct snd_soc_component *component,

			   struct snd_pcm_substream *substream, int cmd)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	const struct sof_ipc_pcm_ops *pcm_ops = sof_ipc_get_ops(sdev, pcm);

	struct snd_sof_pcm *spcm;
@@ -386,7 +386,7 @@ static int sof_pcm_trigger(struct snd_soc_component *component, 
static snd_pcm_uframes_t sof_pcm_pointer(struct snd_soc_component *component,

					 struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_sof_pcm *spcm;

	snd_pcm_uframes_t host, dai;
@@ -417,7 +417,7 @@ static snd_pcm_uframes_t sof_pcm_pointer(struct snd_soc_component *component, 
static int sof_pcm_open(struct snd_soc_component *component,

			struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_sof_dsp_ops *ops = sof_ops(sdev);
@@ -482,7 +482,7 @@ static int sof_pcm_open(struct snd_soc_component *component, 
static int sof_pcm_close(struct snd_soc_component *component,

			 struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component);

	struct snd_sof_pcm *spcm;

	int err;