Unverified Commit 742e622d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: generic: switch to use rtd->id from rtd->num 



Now rtd->num is renamed to rtd->id. Let's switch.

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


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

sound/soc/generic/simple-card-utils.c

+5 −5
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ int simple_util_startup(struct snd_pcm_substream *substream) 
{

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num);

	struct simple_dai_props *props = simple_priv_to_props(priv, rtd->id);

	struct simple_util_dai *dai;

	unsigned int fixed_sysclk = 0;

	int i1, i2, i;
@@ -357,7 +357,7 @@ void simple_util_shutdown(struct snd_pcm_substream *substream) 
{

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num);

	struct simple_dai_props *props = simple_priv_to_props(priv, rtd->id);

	struct simple_util_dai *dai;

	int i;
@@ -448,7 +448,7 @@ int simple_util_hw_params(struct snd_pcm_substream *substream, 
	struct simple_util_dai *pdai;

	struct snd_soc_dai *sdai;

	struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num);

	struct simple_dai_props *props = simple_priv_to_props(priv, rtd->id);

	unsigned int mclk, mclk_fs = 0;

	int i, ret;
@@ -517,7 +517,7 @@ int simple_util_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
				   struct snd_pcm_hw_params *params)

{

	struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);

	struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->id);

	struct simple_util_data *data = &dai_props->adata;

	struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);

	struct snd_interval *channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
@@ -628,7 +628,7 @@ static int simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, 
int simple_util_dai_init(struct snd_soc_pcm_runtime *rtd)

{

	struct simple_util_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *props = simple_priv_to_props(priv, rtd->num);

	struct simple_dai_props *props = simple_priv_to_props(priv, rtd->id);

	struct simple_util_dai *dai;

	int i, ret;