Unverified Commit 8b12da9a authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: cleanup function parameter for rtd and its id 



some functions had parameter like below

	xxx(..., rtd, ..., id);

This "id" is rtd->id. We don't need to have "id" on each functions
because we can get it from "rtd". Let's cleanup it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87plnqb84p.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-dai.h

+2 −3
Original line number Diff line number Diff line
@@ -216,8 +216,7 @@ void snd_soc_dai_shutdown(struct snd_soc_dai *dai, 
			  struct snd_pcm_substream *substream, int rollback);

void snd_soc_dai_suspend(struct snd_soc_dai *dai);

void snd_soc_dai_resume(struct snd_soc_dai *dai);

int snd_soc_dai_compress_new(struct snd_soc_dai *dai,

			     struct snd_soc_pcm_runtime *rtd, int id);

int snd_soc_dai_compress_new(struct snd_soc_dai *dai, struct snd_soc_pcm_runtime *rtd);

bool snd_soc_dai_stream_valid(const struct snd_soc_dai *dai, int stream);

void snd_soc_dai_action(struct snd_soc_dai *dai,

			int stream, int action);
@@ -275,7 +274,7 @@ struct snd_soc_dai_ops { 
	int (*probe)(struct snd_soc_dai *dai);

	int (*remove)(struct snd_soc_dai *dai);

	/* compress dai */

	int (*compress_new)(struct snd_soc_pcm_runtime *rtd, int id);

	int (*compress_new)(struct snd_soc_pcm_runtime *rtd);

	/* Optional Callback used at pcm creation*/

	int (*pcm_new)(struct snd_soc_pcm_runtime *rtd,

		       struct snd_soc_dai *dai);

include/sound/soc.h

+3 −3
Original line number Diff line number Diff line
@@ -486,11 +486,11 @@ struct snd_soc_component *snd_soc_lookup_component_nolocked(struct device *dev, 
struct snd_soc_component *snd_soc_lookup_component(struct device *dev,

						   const char *driver_name);



int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int id);

int soc_new_pcm(struct snd_soc_pcm_runtime *rtd);

#ifdef CONFIG_SND_SOC_COMPRESS

int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int id);

int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd);

#else

static inline int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int id)

static inline int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd)

{

	return 0;

}

sound/soc/soc-compress.c

+4 −5
Original line number Diff line number Diff line
@@ -537,11 +537,10 @@ static struct snd_compr_ops soc_compr_dyn_ops = { 
 * snd_soc_new_compress - create a new compress.

 *

 * @rtd: The runtime for which we will create compress

 * @id: the device index number (zero based - shared with normal PCMs)

 *

 * Return: 0 for success, else error.

 */

int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int id)

int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_component *component;

	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
@@ -617,7 +616,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int id) 
		snprintf(new_name, sizeof(new_name), "(%s)",

			rtd->dai_link->stream_name);



		ret = snd_pcm_new_internal(rtd->card->snd_card, new_name, id,

		ret = snd_pcm_new_internal(rtd->card->snd_card, new_name, rtd->id,

				playback, capture, &be_pcm);

		if (ret < 0) {

			dev_err(rtd->card->dev,
@@ -638,7 +637,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int id) 
		memcpy(compr->ops, &soc_compr_dyn_ops, sizeof(soc_compr_dyn_ops));

	} else {

		snprintf(new_name, sizeof(new_name), "%s %s-%d",

			rtd->dai_link->stream_name, codec_dai->name, id);

			rtd->dai_link->stream_name, codec_dai->name, rtd->id);



		memcpy(compr->ops, &soc_compr_ops, sizeof(soc_compr_ops));

	}
@@ -652,7 +651,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int id) 
		break;

	}



	ret = snd_compress_new(rtd->card->snd_card, id, direction,

	ret = snd_compress_new(rtd->card->snd_card, rtd->id, direction,

				new_name, compr);

	if (ret < 0) {

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

sound/soc/soc-core.c

+3 −5
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card, 
{

	struct snd_soc_dai_link *dai_link = rtd->dai_link;

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

	int ret, id;

	int ret;



	/* do machine specific initialization */

	ret = snd_soc_link_init(rtd);
@@ -1494,15 +1494,13 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card, 
	/* add DPCM sysfs entries */

	soc_dpcm_debugfs_add(rtd);



	id = rtd->id;



	/* create compress_device if possible */

	ret = snd_soc_dai_compress_new(cpu_dai, rtd, id);

	ret = snd_soc_dai_compress_new(cpu_dai, rtd);

	if (ret != -ENOTSUPP)

		goto err;



	/* create the pcm */

	ret = soc_new_pcm(rtd, id);

	ret = soc_new_pcm(rtd);

	if (ret < 0) {

		dev_err(card->dev, "ASoC: can't create pcm %s :%d\n",

			dai_link->stream_name, ret);

sound/soc/soc-dai.c

+2 −2
Original line number Diff line number Diff line
@@ -457,12 +457,12 @@ void snd_soc_dai_shutdown(struct snd_soc_dai *dai, 
}



int snd_soc_dai_compress_new(struct snd_soc_dai *dai,

			     struct snd_soc_pcm_runtime *rtd, int id)

			     struct snd_soc_pcm_runtime *rtd)

{

	int ret = -ENOTSUPP;

	if (dai->driver->ops &&

	    dai->driver->ops->compress_new)

		ret = dai->driver->ops->compress_new(rtd, id);

		ret = dai->driver->ops->compress_new(rtd);

	return soc_dai_ret(dai, ret);

}