Unverified Commit 40e47e2d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: rename rtd->num to rtd->id 



Current rtd has "num". It sounds/looks like size of rtd or something,
but it will be mainly used at snd_pcm_new() as "device index".
This naming is confusable. Let's rename it to "id"

Some drivers are using rtd->num, so let's keep it so far, and remove
it if all user was switched.

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


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

include/sound/soc-dai.h

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ void snd_soc_dai_shutdown(struct snd_soc_dai *dai, 
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 num);

			     struct snd_soc_pcm_runtime *rtd, int id);

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 +275,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 num);

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

	/* Optional Callback used at pcm creation*/

	int (*pcm_new)(struct snd_soc_pcm_runtime *rtd,

		       struct snd_soc_dai *dai);

include/sound/soc.h

+5 −4
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 num);

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

#ifdef CONFIG_SND_SOC_COMPRESS

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

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

#else

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

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

{

	return 0;

}
@@ -1195,7 +1195,8 @@ struct snd_soc_pcm_runtime { 
	struct dentry *debugfs_dpcm_root;

#endif



	unsigned int num; /* 0-based and monotonic increasing */

	unsigned int num; /* REMOVE ME */

	unsigned int id; /* 0-based and monotonic increasing */

	struct list_head list; /* rtd list of the soc card */



	/* function mark */

sound/soc/soc-compress.c

+5 −5
Original line number Diff line number Diff line
@@ -537,11 +537,11 @@ 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

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

 * @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 num)

int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int id)

{

	struct snd_soc_component *component;

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

			rtd->dai_link->stream_name);



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

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

				playback, capture, &be_pcm);

		if (ret < 0) {

			dev_err(rtd->card->dev,
@@ -638,7 +638,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 
		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, num);

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



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

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

	}



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

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

				new_name, compr);

	if (ret < 0) {

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

sound/soc/soc-core.c

+8 −7
Original line number Diff line number Diff line
@@ -558,7 +558,8 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( 
	 */

	rtd->card	= card;

	rtd->dai_link	= dai_link;

	rtd->num	= card->num_rtd++;

	rtd->id		= card->num_rtd++;

	rtd->num	= rtd->id;			/* REMOVE ME */

	rtd->pmdown_time = pmdown_time;			/* default power off timeout */



	/* see for_each_card_rtds */
@@ -1458,7 +1459,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);

	struct snd_soc_component *component;

	int ret, num, i;

	int ret, id, i;



	/* do machine specific initialization */

	ret = snd_soc_link_init(rtd);
@@ -1473,7 +1474,7 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card, 
	/* add DPCM sysfs entries */

	soc_dpcm_debugfs_add(rtd);



	num = rtd->num;

	id = rtd->id;



	/*

	 * most drivers will register their PCMs using DAI link ordering but
@@ -1485,18 +1486,18 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card, 
			continue;



		if (rtd->dai_link->no_pcm)

			num += component->driver->be_pcm_base;

			id += component->driver->be_pcm_base;

		else

			num = rtd->dai_link->id;

			id = rtd->dai_link->id;

	}



	/* create compress_device if possible */

	ret = snd_soc_dai_compress_new(cpu_dai, rtd, num);

	ret = snd_soc_dai_compress_new(cpu_dai, rtd, id);

	if (ret != -ENOTSUPP)

		goto err;



	/* create the pcm */

	ret = soc_new_pcm(rtd, num);

	ret = soc_new_pcm(rtd, id);

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

			     struct snd_soc_pcm_runtime *rtd, int id)

{

	int ret = -ENOTSUPP;

	if (dai->driver->ops &&

	    dai->driver->ops->compress_new)

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

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

	return soc_dai_ret(dai, ret);

}