ASoC: generic: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer (e7718a72) · Commits · 戴 / test

sound/soc/generic/simple-card-utils.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -213,8 +213,8 @@ EXPORT_SYMBOL_GPL(asoc_simple_startup);
		void asoc_simple_shutdown(struct snd_pcm_substream *substream)
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_dai *codec_dai = rtd->codec_dai;
		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
		struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
		struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
		struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);
		struct simple_dai_props *dai_props =
		simple_priv_to_props(priv, rtd->num);
		@@ -249,8 +249,8 @@ int asoc_simple_hw_params(struct snd_pcm_substream *substream,
		struct snd_pcm_hw_params *params)
		{
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		struct snd_soc_dai *codec_dai = rtd->codec_dai;
		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
		struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
		struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
		struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);
		struct simple_dai_props *dai_props =
		simple_priv_to_props(priv, rtd->num);
		@@ -381,12 +381,12 @@ int asoc_simple_dai_init(struct snd_soc_pcm_runtime *rtd)
		struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);
		int ret;

		ret = asoc_simple_init_dai(rtd->codec_dai,
		ret = asoc_simple_init_dai(asoc_rtd_to_codec(rtd, 0),
		dai_props->codec_dai);
		if (ret < 0)
		return ret;

		ret = asoc_simple_init_dai(rtd->cpu_dai,
		ret = asoc_simple_init_dai(asoc_rtd_to_cpu(rtd, 0),
		dai_props->cpu_dai);
		if (ret < 0)
		return ret;

Admin message