Skip to content

Commit b19f75d

Browse files
morimotobroonie
authored andcommitted
ASoC: meson: switch to use rtd->id from rtd->num
Now rtd->num is renamed to rtd->id. Let's switch. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Jerome Brunet <jbrunet@baylibre.com> Link: https://patch.msgid.link/87wmhyb85l.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent eae33f7 commit b19f75d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

sound/soc/meson/axg-card.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static int axg_card_tdm_be_hw_params(struct snd_pcm_substream *substream,
4343
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
4444
struct meson_card *priv = snd_soc_card_get_drvdata(rtd->card);
4545
struct axg_dai_link_tdm_data *be =
46-
(struct axg_dai_link_tdm_data *)priv->link_data[rtd->num];
46+
(struct axg_dai_link_tdm_data *)priv->link_data[rtd->id];
4747

4848
return meson_card_i2s_set_sysclk(substream, params, be->mclk_fs);
4949
}
@@ -56,7 +56,7 @@ static int axg_card_tdm_dai_init(struct snd_soc_pcm_runtime *rtd)
5656
{
5757
struct meson_card *priv = snd_soc_card_get_drvdata(rtd->card);
5858
struct axg_dai_link_tdm_data *be =
59-
(struct axg_dai_link_tdm_data *)priv->link_data[rtd->num];
59+
(struct axg_dai_link_tdm_data *)priv->link_data[rtd->id];
6060
struct snd_soc_dai *codec_dai;
6161
int ret, i;
6262

@@ -86,7 +86,7 @@ static int axg_card_tdm_dai_lb_init(struct snd_soc_pcm_runtime *rtd)
8686
{
8787
struct meson_card *priv = snd_soc_card_get_drvdata(rtd->card);
8888
struct axg_dai_link_tdm_data *be =
89-
(struct axg_dai_link_tdm_data *)priv->link_data[rtd->num];
89+
(struct axg_dai_link_tdm_data *)priv->link_data[rtd->id];
9090
int ret;
9191

9292
/* The loopback rx_mask is the pad tx_mask */

sound/soc/meson/gx-card.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static int gx_card_i2s_be_hw_params(struct snd_pcm_substream *substream,
3232
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
3333
struct meson_card *priv = snd_soc_card_get_drvdata(rtd->card);
3434
struct gx_dai_link_i2s_data *be =
35-
(struct gx_dai_link_i2s_data *)priv->link_data[rtd->num];
35+
(struct gx_dai_link_i2s_data *)priv->link_data[rtd->id];
3636

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

0 commit comments

Comments
 (0)