tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87sf71fo32.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown 4d5f4119 a2c1125e

+17 -17
+3 -3
sound/soc/sof/ipc3-pcm.c
··· 17 17 struct snd_pcm_substream *substream) 18 18 { 19 19 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 20 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 20 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 21 21 struct sof_ipc_stream stream; 22 22 struct snd_sof_pcm *spcm; 23 23 ··· 42 42 struct snd_sof_platform_stream_params *platform_params) 43 43 { 44 44 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 45 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 45 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 46 46 struct sof_ipc_fw_version *v = &sdev->fw_ready.version; 47 47 struct snd_pcm_runtime *runtime = substream->runtime; 48 48 struct sof_ipc_pcm_params_reply ipc_params_reply; ··· 142 142 static int sof_ipc3_pcm_trigger(struct snd_soc_component *component, 143 143 struct snd_pcm_substream *substream, int cmd) 144 144 { 145 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 145 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 146 146 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 147 147 struct sof_ipc_stream stream; 148 148 struct snd_sof_pcm *spcm;
+4 -4
sound/soc/sof/ipc4-pcm.c
··· 280 280 struct snd_pcm_substream *substream, int state, int cmd) 281 281 { 282 282 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 283 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 283 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 284 284 struct snd_sof_pcm_stream_pipeline_list *pipeline_list; 285 285 struct sof_ipc4_fw_data *ipc4_data = sdev->private; 286 286 struct ipc4_pipeline_set_state_data *trigger_list; ··· 519 519 struct snd_sof_dai *dai = snd_sof_find_dai(component, rtd->dai_link->name); 520 520 struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); 521 521 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 522 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); 522 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); 523 523 struct sof_ipc4_audio_format *ipc4_fmt; 524 524 struct sof_ipc4_copier *ipc4_copier; 525 525 bool single_fmt = false; ··· 743 743 struct snd_sof_platform_stream_params *platform_params) 744 744 { 745 745 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 746 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 746 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 747 747 struct sof_ipc4_timestamp_info *time_info; 748 748 struct snd_sof_pcm *spcm; 749 749 ··· 804 804 struct snd_pcm_substream *substream) 805 805 { 806 806 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 807 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 807 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 808 808 struct sof_ipc4_timestamp_info *time_info; 809 809 struct sof_ipc4_llp_reading_slot llp; 810 810 snd_pcm_uframes_t head_ptr, tail_ptr;
+1 -1
sound/soc/sof/nocodec.c
··· 44 44 links[i].stream_name = links[i].name; 45 45 46 46 links[i].cpus = &dlc[0]; 47 - links[i].codecs = &asoc_dummy_dlc; 47 + links[i].codecs = &snd_soc_dummy_dlc; 48 48 links[i].platforms = &dlc[1]; 49 49 50 50 links[i].num_cpus = 1;
+9 -9
sound/soc/sof/pcm.c
··· 25 25 struct snd_pcm_substream *substream, 26 26 unsigned char *dma_area, size_t size) 27 27 { 28 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 28 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 29 29 struct snd_sof_pcm *spcm; 30 30 struct snd_dma_buffer *dmab = snd_pcm_get_dma_buf(substream); 31 31 int stream = substream->stream; ··· 60 60 */ 61 61 void snd_sof_pcm_period_elapsed(struct snd_pcm_substream *substream) 62 62 { 63 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 63 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 64 64 struct snd_soc_component *component = 65 65 snd_soc_rtdcom_lookup(rtd, SOF_AUDIO_PCM_DRV_NAME); 66 66 struct snd_sof_pcm *spcm; ··· 124 124 struct snd_pcm_hw_params *params) 125 125 { 126 126 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 127 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 127 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 128 128 const struct sof_ipc_pcm_ops *pcm_ops = sof_ipc_get_ops(sdev, pcm); 129 129 struct snd_sof_platform_stream_params platform_params = { 0 }; 130 130 struct snd_pcm_runtime *runtime = substream->runtime; ··· 194 194 static int sof_pcm_hw_free(struct snd_soc_component *component, 195 195 struct snd_pcm_substream *substream) 196 196 { 197 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 197 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 198 198 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 199 199 const struct sof_ipc_pcm_ops *pcm_ops = sof_ipc_get_ops(sdev, pcm); 200 200 struct snd_sof_pcm *spcm; ··· 246 246 static int sof_pcm_prepare(struct snd_soc_component *component, 247 247 struct snd_pcm_substream *substream) 248 248 { 249 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 249 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 250 250 struct snd_sof_pcm *spcm; 251 251 int ret; 252 252 ··· 283 283 static int sof_pcm_trigger(struct snd_soc_component *component, 284 284 struct snd_pcm_substream *substream, int cmd) 285 285 { 286 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 286 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 287 287 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 288 288 const struct sof_ipc_pcm_ops *pcm_ops = sof_ipc_get_ops(sdev, pcm); 289 289 struct snd_sof_pcm *spcm; ··· 386 386 static snd_pcm_uframes_t sof_pcm_pointer(struct snd_soc_component *component, 387 387 struct snd_pcm_substream *substream) 388 388 { 389 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 389 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 390 390 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 391 391 struct snd_sof_pcm *spcm; 392 392 snd_pcm_uframes_t host, dai; ··· 417 417 static int sof_pcm_open(struct snd_soc_component *component, 418 418 struct snd_pcm_substream *substream) 419 419 { 420 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 420 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 421 421 struct snd_pcm_runtime *runtime = substream->runtime; 422 422 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 423 423 struct snd_sof_dsp_ops *ops = sof_ops(sdev); ··· 482 482 static int sof_pcm_close(struct snd_soc_component *component, 483 483 struct snd_pcm_substream *substream) 484 484 { 485 - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); 485 + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); 486 486 struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(component); 487 487 struct snd_sof_pcm *spcm; 488 488 int err;