Unverified Commit 28b11fd4 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87fs3kp8sz.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/soc-compress.c

+18 −18
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ static void snd_soc_compr_components_free(struct snd_compr_stream *cstream, 
static int soc_compr_clean(struct snd_compr_stream *cstream, int rollback)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

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

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

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

	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);

	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */



	snd_soc_dpcm_mutex_lock(rtd);
@@ -98,7 +98,7 @@ static int soc_compr_free(struct snd_compr_stream *cstream) 
static int soc_compr_open(struct snd_compr_stream *cstream)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	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);

	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */

	int ret;
@@ -133,7 +133,7 @@ static int soc_compr_open(struct snd_compr_stream *cstream) 
static int soc_compr_open_fe(struct snd_compr_stream *cstream)

{

	struct snd_soc_pcm_runtime *fe = cstream->private_data;

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

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

	struct snd_soc_dpcm *dpcm;

	struct snd_soc_dapm_widget_list *list;

	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */
@@ -203,7 +203,7 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) 
static int soc_compr_free_fe(struct snd_compr_stream *cstream)

{

	struct snd_soc_pcm_runtime *fe = cstream->private_data;

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

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

	struct snd_soc_dpcm *dpcm;

	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */
@@ -244,8 +244,8 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) 
static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

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

	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);

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

	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */

	int ret;
@@ -276,7 +276,7 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd) 
static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)

{

	struct snd_soc_pcm_runtime *fe = cstream->private_data;

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

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

	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */

	int ret;
@@ -323,7 +323,7 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream, 
				struct snd_compr_params *params)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	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);

	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */

	int ret;
@@ -369,7 +369,7 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream, 
	struct snd_soc_pcm_runtime *fe = cstream->private_data;

	struct snd_pcm_substream *fe_substream =

		 fe->pcm->streams[cstream->direction].substream;

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

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

	int stream = cstream->direction; /* SND_COMPRESS_xxx is same as SNDRV_PCM_STREAM_xxx */

	int ret;
@@ -419,7 +419,7 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream, 
				struct snd_codec *params)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	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);

	int ret = 0;



	snd_soc_dpcm_mutex_lock(rtd);
@@ -437,7 +437,7 @@ static int soc_compr_get_params(struct snd_compr_stream *cstream, 
static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	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);

	int ret;



	snd_soc_dpcm_mutex_lock(rtd);
@@ -457,7 +457,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream, 
{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	int ret;

	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);



	snd_soc_dpcm_mutex_lock(rtd);
@@ -475,7 +475,7 @@ static int soc_compr_set_metadata(struct snd_compr_stream *cstream, 
				  struct snd_compr_metadata *metadata)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	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);

	int ret;



	ret = snd_soc_dai_compr_set_metadata(cpu_dai, cstream, metadata);
@@ -489,7 +489,7 @@ static int soc_compr_get_metadata(struct snd_compr_stream *cstream, 
				  struct snd_compr_metadata *metadata)

{

	struct snd_soc_pcm_runtime *rtd = cstream->private_data;

	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);

	int ret;



	ret = snd_soc_dai_compr_get_metadata(cpu_dai, cstream, metadata);
@@ -540,8 +540,8 @@ static struct snd_compr_ops soc_compr_dyn_ops = { 
int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)

{

	struct snd_soc_component *component;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

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

	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);

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

	struct snd_compr *compr;

	struct snd_pcm *be_pcm;

	char new_name[64];
@@ -644,7 +644,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 
	ret = snd_compress_new(rtd->card->snd_card, num, direction,

				new_name, compr);

	if (ret < 0) {

		component = asoc_rtd_to_codec(rtd, 0)->component;

		component = snd_soc_rtd_to_codec(rtd, 0)->component;

		dev_err(component->dev,

			"Compress ASoC: can't create compress for codec %s: %d\n",

			component->name, ret);