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

ASoC: meson: 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>
Acked-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://patch.msgid.link/87wmhyb85l.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/meson/axg-card.c

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static int axg_card_tdm_be_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

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

	struct axg_dai_link_tdm_data *be =

		(struct axg_dai_link_tdm_data *)priv->link_data[rtd->num];

		(struct axg_dai_link_tdm_data *)priv->link_data[rtd->id];



	return meson_card_i2s_set_sysclk(substream, params, be->mclk_fs);

}
@@ -56,7 +56,7 @@ static int axg_card_tdm_dai_init(struct snd_soc_pcm_runtime *rtd) 
{

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

	struct axg_dai_link_tdm_data *be =

		(struct axg_dai_link_tdm_data *)priv->link_data[rtd->num];

		(struct axg_dai_link_tdm_data *)priv->link_data[rtd->id];

	struct snd_soc_dai *codec_dai;

	int ret, i;
@@ -86,7 +86,7 @@ static int axg_card_tdm_dai_lb_init(struct snd_soc_pcm_runtime *rtd) 
{

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

	struct axg_dai_link_tdm_data *be =

		(struct axg_dai_link_tdm_data *)priv->link_data[rtd->num];

		(struct axg_dai_link_tdm_data *)priv->link_data[rtd->id];

	int ret;



	/* The loopback rx_mask is the pad tx_mask */

sound/soc/meson/gx-card.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static int gx_card_i2s_be_hw_params(struct snd_pcm_substream *substream, 
	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

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

	struct gx_dai_link_i2s_data *be =

		(struct gx_dai_link_i2s_data *)priv->link_data[rtd->num];

		(struct gx_dai_link_i2s_data *)priv->link_data[rtd->id];



	return meson_card_i2s_set_sysclk(substream, params, be->mclk_fs);

}