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>

diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
index 5ebf287fe7004e08686132f53382fa756be89e21..a2dfccb7990f3a53f508fc6724b21de53b4494d8 100644 (file)
--- a/sound/soc/meson/axg-card.c
+++ b/sound/soc/meson/axg-card.c
@@ -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 */

diff --git a/sound/soc/meson/gx-card.c b/sound/soc/meson/gx-card.c
index 455f6bfc9f8fa538988379bb7fb411d22eb8b57c..b408cc2bbc9193ae56d02b4fcd05af8df3f93d80 100644 (file)
--- a/sound/soc/meson/gx-card.c
+++ b/sound/soc/meson/gx-card.c
@@ -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);
 }