ASoC: meson: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer (385a5c60) · Commits · 戴 / test

sound/soc/meson/aiu-fifo.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ static struct snd_soc_dai aiu_fifo_dai(struct snd_pcm_substream ss)
		{
		struct snd_soc_pcm_runtime *rtd = ss->private_data;

		return rtd->cpu_dai;
		return asoc_rtd_to_cpu(rtd, 0);
		}

		snd_pcm_uframes_t aiu_fifo_pointer(struct snd_soc_component *component,

+4 −4

Original line number	Diff line number	Diff line
		@@ -72,10 +72,10 @@ static int axg_card_tdm_dai_init(struct snd_soc_pcm_runtime *rtd)
		}
		}

		ret = axg_tdm_set_tdm_slots(rtd->cpu_dai, be->tx_mask, be->rx_mask,
		ret = axg_tdm_set_tdm_slots(asoc_rtd_to_cpu(rtd, 0), be->tx_mask, be->rx_mask,
		be->slots, be->slot_width);
		if (ret) {
		dev_err(rtd->cpu_dai->dev, "setting tdm link slots failed\n");
		dev_err(asoc_rtd_to_cpu(rtd, 0)->dev, "setting tdm link slots failed\n");
		return ret;
		}

		@@ -90,10 +90,10 @@ static int axg_card_tdm_dai_lb_init(struct snd_soc_pcm_runtime *rtd)
		int ret;

		/* The loopback rx_mask is the pad tx_mask */
		ret = axg_tdm_set_tdm_slots(rtd->cpu_dai, NULL, be->tx_mask,
		ret = axg_tdm_set_tdm_slots(asoc_rtd_to_cpu(rtd, 0), NULL, be->tx_mask,
		be->slots, be->slot_width);
		if (ret) {
		dev_err(rtd->cpu_dai->dev, "setting tdm link slots failed\n");
		dev_err(asoc_rtd_to_cpu(rtd, 0)->dev, "setting tdm link slots failed\n");
		return ret;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ static struct snd_soc_dai axg_fifo_dai(struct snd_pcm_substream ss)
		{
		struct snd_soc_pcm_runtime *rtd = ss->private_data;

		return rtd->cpu_dai;
		return asoc_rtd_to_cpu(rtd, 0);
		}

		static struct axg_fifo axg_fifo_data(struct snd_pcm_substream ss)

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ int meson_card_i2s_set_sysclk(struct snd_pcm_substream *substream,
		return ret;
		}

		ret = snd_soc_dai_set_sysclk(rtd->cpu_dai, 0, mclk,
		ret = snd_soc_dai_set_sysclk(asoc_rtd_to_cpu(rtd, 0), 0, mclk,
		SND_SOC_CLOCK_OUT);
		if (ret && ret != -ENOTSUPP)
		return ret;