On Thu 24 Oct 2024 at 01:29, Kuninori Morimoto kuninori.morimoto.gx@renesas.com wrote:
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
Just one comment: I understand why you have split this into multiple patches, I suppose it will help with the review but I wonder if it wouldn't be better to squash it all into a single change before applying ? To avoid exposing the intermediate state. It might be confusing too. The change would not be that big actually.
Just a suggestion ;)
sound/soc/meson/axg-card.c | 6 +++--- sound/soc/meson/gx-card.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index 5ebf287fe7004..a2dfccb7990f3 100644 --- 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];@@ -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 455f6bfc9f8fa..b408cc2bbc919 100644 --- 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);
}