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

ASoC: soc-compress: 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/87fs3kp8sz.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown 28b11fd4 8bfbdb18

+18 -18
+18 -18
sound/soc/soc-compress.c
··· 57 57 static int soc_compr_clean(struct snd_compr_stream *cstream, int rollback) 58 58 { 59 59 struct snd_soc_pcm_runtime *rtd = cstream->private_data; 60 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); 61 - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); 60 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); 61 + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); 62 62 int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ 63 63 64 64 snd_soc_dpcm_mutex_lock(rtd); ··· 98 98 static int soc_compr_open(struct snd_compr_stream *cstream) 99 99 { 100 100 struct snd_soc_pcm_runtime *rtd = cstream->private_data; 101 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); 101 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); 102 102 int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ 103 103 int ret; 104 104 ··· 133 133 static int soc_compr_open_fe(struct snd_compr_stream *cstream) 134 134 { 135 135 struct snd_soc_pcm_runtime *fe = cstream->private_data; 136 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0); 136 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(fe, 0); 137 137 struct snd_soc_dpcm *dpcm; 138 138 struct snd_soc_dapm_widget_list *list; 139 139 int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ ··· 203 203 static int soc_compr_free_fe(struct snd_compr_stream *cstream) 204 204 { 205 205 struct snd_soc_pcm_runtime *fe = cstream->private_data; 206 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0); 206 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(fe, 0); 207 207 struct snd_soc_dpcm *dpcm; 208 208 int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ 209 209 ··· 244 244 static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd) 245 245 { 246 246 struct snd_soc_pcm_runtime *rtd = cstream->private_data; 247 - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); 248 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); 247 + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); 248 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); 249 249 int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ 250 250 int ret; 251 251 ··· 276 276 static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd) 277 277 { 278 278 struct snd_soc_pcm_runtime *fe = cstream->private_data; 279 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0); 279 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(fe, 0); 280 280 int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ 281 281 int ret; 282 282 ··· 323 323 struct snd_compr_params *params) 324 324 { 325 325 struct snd_soc_pcm_runtime *rtd = cstream->private_data; 326 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); 326 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); 327 327 int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ 328 328 int ret; 329 329 ··· 369 369 struct snd_soc_pcm_runtime *fe = cstream->private_data; 370 370 struct snd_pcm_substream *fe_substream = 371 371 fe->pcm->streams[cstream->direction].substream; 372 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(fe, 0); 372 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(fe, 0); 373 373 int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */ 374 374 int ret; 375 375 ··· 419 419 struct snd_codec *params) 420 420 { 421 421 struct snd_soc_pcm_runtime *rtd = cstream->private_data; 422 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); 422 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); 423 423 int ret = 0; 424 424 425 425 snd_soc_dpcm_mutex_lock(rtd); ··· 437 437 static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes) 438 438 { 439 439 struct snd_soc_pcm_runtime *rtd = cstream->private_data; 440 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); 440 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); 441 441 int ret; 442 442 443 443 snd_soc_dpcm_mutex_lock(rtd); ··· 457 457 { 458 458 struct snd_soc_pcm_runtime *rtd = cstream->private_data; 459 459 int ret; 460 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); 460 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); 461 461 462 462 snd_soc_dpcm_mutex_lock(rtd); 463 463 ··· 475 475 struct snd_compr_metadata *metadata) 476 476 { 477 477 struct snd_soc_pcm_runtime *rtd = cstream->private_data; 478 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); 478 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); 479 479 int ret; 480 480 481 481 ret = snd_soc_dai_compr_set_metadata(cpu_dai, cstream, metadata); ··· 489 489 struct snd_compr_metadata *metadata) 490 490 { 491 491 struct snd_soc_pcm_runtime *rtd = cstream->private_data; 492 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); 492 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); 493 493 int ret; 494 494 495 495 ret = snd_soc_dai_compr_get_metadata(cpu_dai, cstream, metadata); ··· 540 540 int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 541 541 { 542 542 struct snd_soc_component *component; 543 - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); 544 - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); 543 + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); 544 + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); 545 545 struct snd_compr *compr; 546 546 struct snd_pcm *be_pcm; 547 547 char new_name[64]; ··· 644 644 ret = snd_compress_new(rtd->card->snd_card, num, direction, 645 645 new_name, compr); 646 646 if (ret < 0) { 647 - component = asoc_rtd_to_codec(rtd, 0)->component; 647 + component = snd_soc_rtd_to_codec(rtd, 0)->component; 648 648 dev_err(component->dev, 649 649 "Compress ASoC: can't create compress for codec %s: %d\n", 650 650 component->name, ret);